repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: Describe other situations where -z affects git diff
2010-04-18
Charles Bailey
Documentatio
n
:
D
e
scri
b
e
other
s
ituations where -z
a
f
f
ects
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Bailey
C
h
ange xdl_me
r
ge to generate
o
utput e
v
en for
n
u
l
l merges
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
a
iley
t6023: merge-fil
e
fails to outp
u
t
a
nything for a degenerate
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s
Bailey
mergetool: fix runnin
g
mer
g
e
t
ool i
n
sub-directorie
s
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool: Add
a test
for running merge
t
ool in a sub
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-27
Char
l
es Bailey
mergetool: r
e
spect auto
c
rlf by u
s
i
n
g
c
h
eckout-in
d
ex
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Ba
i
l
e
y
merg
e
tool: D
o
n't keep tempor
a
ry
m
e
rge files unless
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mer
g
etool:
A
dd p
r
ompt to conti
n
ue after failing to
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
le
y
Add -y
/
--
n
o-prompt option to me
r
getool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Bailey
Fix
s
ome tab/s
p
ace inconsiste
n
ci
e
s in
g
i
t-mer
g
etool
.
sh
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
Charles Ba
i
ley
g
i
t
-archive: 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 respect core
.
a
u
to
c
rlf when
cr
e
a
t
ing
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles Bailey
Add new test to
de
m
onstrate g
i
t archive co
r
e
.
a
u
toc
r
lf
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bailey
merge-tool documenta
t
ion: d
e
scribe cust
o
m
command usag
e
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Ba
i
ley
git-
m
e
r
g
etool
d
ocument
a
iton: show toolnames in
typewrite
r
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
C
harl
e
s Bailey
Add a very basic test
s
cript f
o
r gi
t
mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es
B
ailey
Teach git
me
r
g
e
tool to u
s
e custom commands
defined
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Chan
g
ed an intern
a
l
varia
b
le of m
e
rgetool
t
o support
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up git
m
ergetool's
b
a
c
k
up f
i
le b
e
havi
o
ur
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arles Bailey
gitk: Fix the Makef
i
le
t
o
cop
e
wi
t
h
system
s
lacking
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
rles Ba
i
ley
Remov
e
o
l
d
generated f
i
les from
.
gi
t
ignore
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-i
n
st
a
w
e
b
br
e
a
kage on MacO
S
X due to t
h
e
l
i
mited
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone not t
o
i
g
nore dep
t
h
w
hen perform
i
ng a l
o
cal
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree