repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-merge: allow using a custom strategy
2008-07-30
Miklos Vajna
builtin-merge:
allow usin
g
a custom st
r
ategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
n
a
builtin-help
:
make som
e
internal functi
o
ns available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
Vajna
t7601: extend the 'merge
p
icks up
t
he best re
s
ult'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos Vajna
builtin-me
r
ge: give a proper er
r
or messa
g
e for
in
v
alid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los Vaj
n
a
Te
a
ch 'g
i
t mer
g
e'
t
h
at some merge s
t
rate
g
ie
s
no l
o
nger
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
A
d
d a
n
e
w
test
f
or git-me
r
g
e
-r
e
solv
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Va
j
na
t6021: add a
new
t
es
t
f
o
r git-merg
e
-reso
l
ve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make
r
em
o
ve-dashes: apply
to scri
p
ts an
d
programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
g
i
t
-bisect: u
s
e dash-less form on git bis
e
ct
log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-
o
bject
.
sh: us
e
quotes for the t
e
st descripti
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t00
0
1-init
.
sh: change
c
o
nfusing directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fi
x
t76
0
1-merge-
p
ull
-
co
n
fig
.
sh
o
n AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
g
it
-
com
m
it
-
tr
e
e: mak
e
it
u
sable from other built
i
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s
V
ajna
A
dd new test case
to ensure
git-merg
e
p
r
epends t
h
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
h
g-to-gi
t
:
u
se
git init instead of git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-git:
rewrite "gi
t
-frot
z
" to
"git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s
Vajna
h
g-to-git: ab
o
rt if the project direct
o
ry is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los
V
ajn
a
hg-to-g
i
t
:
av
o
id raising
a string exce
p
t
ion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
INSTALL: Update sect
i
o
n about git-f
r
otz for
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajn
a
Retire 'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
A
dd new test case to ensure git-merge
r
edu
c
es octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Add new tes
t
to ensure git-merge handles m
o
re t
h
a
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
na
Introduce
g
et
_
octo
p
u
s
_m
e
r
ge_bases() in commi
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os V
a
jna
g
it-fmt-merge-msg: make it u
s
able from
other buil
t
ins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_cache_u
n
me
r
ged() to re
a
d
-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add new
t
est to ens
u
re git-merge
h
andles
p
u
l
l
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Mov
e
p
arse-opti
o
ns's skip_prefix() to g
i
t-compat-
u
til
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
M
o
ve co
m
mi
t
_list_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
M
ove
s
plit_cmdline(
)
to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
iklos Vajna
p
ath-l
i
st docu
m
enta
t
ion: do
c
ument
a
ll functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Vajna
run
-
co
m
mand documenta
t
ion: fix
"
memset()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
a
jna
git-read-tree: document
-
v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos V
a
jn
a
A
simp
l
e scri
p
t
to parse the results from
t
he
t
e
stcase
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajn
a
git-rebas
e
-
i: mention the
short command alia
s
es in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
Remove unused code in pars
e
_commit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Va
j
na
Strbuf
documentation: docum
e
nt m
o
s
t
functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Mik
l
os Vaj
n
a
Revisi
o
n walking
d
ocument
a
t
i
o
n:
docume
n
t most
important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
M
ik
l
os
V
ajna
CodingGuid
e
line
s
: Add a
not
e
t
o
avoid as
s
ig
n
ment
s
i
nside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
M
iklos Vajna
git-merge:
e
xclude unnec
e
ssary
o
p
t
ions from OPTIONS_SP
E
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-import: rename cmd_*() functions to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
M
i
klos
Vajna
INSTALL: add a note about GNU interactive to
o
ls has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests for se
n
demail
.
cc c
o
nfigu
r
ation va
r
iable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
l
o
s Vajna
git
-
send-email: add a new sendemail
.
cc con
f
igura
t
ion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
o
s
Vajn
a
git
-
form
a
t-
p
atc
h
: add a new for
m
at
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Va
j
n
a
gi
t
checkout: add -t alias for
--tra
c
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os Vajna
diff options doc
u
mentation
:
ref
e
r to --diff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
contrib/hook
s
: a
d
d
a
n example pre-auto
-
gc
h
ook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
D
o
cumentation/hook
s
: a
d
d
pre-auto-gc
h
o
ok
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
git-gc -
-
auto: add pre-au
t
o-gc hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
M
i
klos Vajna
D
o
c
umentation/git-merge: document subtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
M
iklos Vajna
git-gu
i
: Upda
t
ed Hungari
a
n t
r
anslation
(e
5
fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
los Vajna
Upda
t
e Hungarian translation
.
100% complet
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos V
a
jna
Improve t6029
to chec
k
t
h
e real "subtre
e
"
case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
M
iklos
V
ajn
a
D
o
cument
a
tion/git svn
l
og: add a n
o
te about timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Docu
m
entati
o
n/gi
t
-filter
-
bra
n
ch
:
add a
n
ew msg
-
f
ilter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
g
i
t-clean: handle errors if removing file
s
fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
V
ajna
Documen
t
ation/git
-
st
a
sh: document o
p
tions f
o
r git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git clone -s docume
n
tation: f
o
rce a new
paragraph fo
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mi
k
los
V
ajna
bui
l
tin-gc
.
c: guard con
f
i
g
parser from value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Mi
k
los
V
ajna
g
i
t
r
ev-parse manp
a
g
e: spelling
fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull
m
anpage
:
d
o
n't include -n from
f
etch-option
s
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone -s: doc
u
ment probl
e
ms with git gc
-
-pr
u
ne
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
M
i
klos Vajna
Includ
e
rev-lis
t
options
i
n
g
it-log manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls
-
remote:
a
dd -
t
a
n
d
-h opti
o
ns
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Mi
k
los Vajna
Add using mer
g
e
subtree
H
o
w-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Mi
k
lo
s
Vaj
n
a
t
/t
7
001: avoid
u
n
n
ecess
a
r
y ERE when usin
g
grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-s
h
-setup: document git_edi
t
or() and get_au
t
ho
r
_ident_f
r
o
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
M
iklos Vajna
everyday: replace 'prune' a
n
d 'r
e
p
a
ck' with '
g
c'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mi
k
los
V
a
jna
Update H
u
ngarian translation
.
1
0
0% completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include
diff opti
o
ns in the
g
it-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-send-email: add a new
s
end
e
mail
.
to co
n
figuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
Vajna
g
it
s
t
a
sh: do
c
ument apply's --index
s
witch
commit
|
commitdiff
|
tree
2007-09-29
Miklos
Vajna
git-b
u
ndle: fix commandline examples in the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos V
a
jna
U
s
er Manual: add a c
h
ap
t
er for submod
u
l
e
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklo
s
Vajna
H
ungarian tr
a
nslat
i
on of
g
it-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajn
a
gitweb: new cgi parameter:
opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklo
s
Vaj
n
a
g
itweb: p
r
e
f
er git_get_pro
j
ect_owner
(
)
o
ver get_fi
l
e_owne
r
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklos
V
a
jna
Document -<n>
for git-forma
t
-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree