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
mergetool: respect autocrlf by using checkout-index
2009-01-27
Charles Bailey
m
e
rgetool
:
respect autocrl
f
by us
i
ng ch
e
cko
u
t-index
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
C
harles Bail
e
y
m
e
r
g
etool:
Don't keep te
m
porary m
e
rge fil
e
s un
l
ess
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
r
les B
a
iley
me
r
getool: Add prompt to continue af
t
e
r fa
i
l
i
ng to
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no-prompt option to merget
o
ol
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bailey
Fix some ta
b
/sp
a
ce incon
s
istencies in gi
t
-
m
ergeto
o
l
.
sh
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
Charles B
a
i
l
e
y
git-a
r
c
h
i
v
e: work in bare repos
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
ley
Make git
ar
c
hive res
p
ect core
.
autocrlf when
c
r
eating
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
C
h
a
r
les Bailey
Add
n
ew test to demonstrat
e
git archi
v
e
c
o
re
.
autocrlf
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bailey
merge-t
o
ol documentation: describe custom c
o
mmand usage
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bail
e
y
git-mergetool documentait
o
n: show toolnames in typewriter
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a v
e
r
y basic test sc
r
ipt f
o
r git mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teac
h
git
mergetool
t
o use custom comman
d
s defi
n
ed
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Changed
a
n
i
nternal
variable
o
f me
r
g
e
too
l
to support
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Tidy u
p
g
i
t
mergeto
o
l's backu
p
file
b
ehaviour
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk
:
Fix the Mak
e
file to cope w
i
t
h
systems lacking
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charles Baile
y
Remo
v
e
o
ld
generate
d
fil
e
s
from
.
gitignore
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Ch
a
r
l
es Bai
l
ey
F
i
x git-insta
w
eb breakage o
n
MacOS X due to the limited
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
F
ix clone no
t
to ign
o
re
d
e
pth
when performing a local
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree