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
stash: Don't overwrite files that have gone from the index
2010-04-18
Charles Baile
y
s
tas
h
: Don't ove
r
write files that
h
ave gone from the
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Ba
i
ley
Chan
g
e xdl_merge to gener
a
te output even for null merg
e
s
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: m
e
rge-file fai
l
s to
o
utput an
y
thing for
a
degenerate
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
me
r
getool: f
i
x running me
r
getool in sub-
d
i
r
e
ctories
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bailey
merget
o
ol: Ad
d
a test for running mergetoo
l
in a s
u
b
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
a
i
l
ey
mergetool:
r
espe
c
t autocrlf by using c
h
ecko
u
t
-ind
e
x
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Charles
Baile
y
mer
g
etoo
l
: Don't
k
eep tem
p
orary m
e
rge
f
iles unless
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
le
s
Bailey
mergetool: Ad
d
p
ro
m
pt to continue after failing to
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles Baile
y
A
dd -y/-
-
n
o-p
r
ompt
o
ption to merge
t
oo
l
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some
tab/space in
c
onsistencies in gi
t
-mergetool
.
sh
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
Charles Baile
y
git-archive: wo
r
k
in bare re
p
os
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es Ba
i
ley
M
ake git a
r
ch
i
ve respect core
.
a
u
tocrlf when creating
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
C
harles
B
ailey
Add n
e
w test t
o
de
m
on
s
tr
a
t
e
git archive core
.
a
u
tocrlf
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bai
l
ey
merge-tool document
a
t
ion:
d
escribe cust
o
m comma
n
d
u
s
age
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git
-
me
r
getool
document
a
iton:
s
how
t
oolname
s
in typewriter
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
A
dd a very
basic
t
est script for git m
e
rgetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles
B
ail
e
y
T
each git mergeto
o
l to use custom command
s
define
d
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
aile
y
Changed an intern
a
l variable of
mergetool to
support
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Baile
y
Tidy up git me
r
getool's backup file behavio
u
r
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
e
s Bailey
gitk
:
Fix t
h
e Make
f
ile to cope with systems lacking
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charl
e
s Ba
i
ley
Remov
e
old gen
e
rated
f
ile
s
from
.
gitign
o
re
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charles Baile
y
F
i
x git-instaweb b
r
eakage on MacOS
X due to the limit
e
d
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
Ch
a
rle
s
B
ailey
Fix clone not to ign
o
r
e
depth wh
e
n performing a lo
c
a
l
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree