repo.or.cz
/
git
/
gitweb.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
C
h
a
rles Bailey
Documentatio
n
:
Descri
b
e othe
r
situations where -z
a
ffec
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles Bailey
Change xdl_merge to
generate output eve
n
f
or
n
ull
m
erges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
r
l
es Bail
e
y
t6023: m
e
rge
-
file fails to output any
t
hing for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Baile
y
m
e
rgetool: fi
x
running
m
ergetoo
l
in s
u
b-directori
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool: Add
a
t
est for
r
unning mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arle
s
Bail
e
y
mergetool: res
p
e
ct autocrl
f
by using che
c
k
out-inde
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bai
l
ey
mergetool: Don't
k
eep temporary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool
:
Add prompt to continue after f
a
i
l
ing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bail
e
y
Add
-
y
/
--no-prompt op
t
ion to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
r
l
e
s Bailey
Fix some tab/space in
c
onsi
s
tenc
i
es in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-arc
h
ive: work in ba
r
e
r
epos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make gi
t
archive
r
e
spe
c
t core
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add n
e
w
t
est to demon
s
trate g
i
t archive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
i
l
e
y
mer
g
e-tool documentation: de
s
cribe custom co
m
ma
n
d usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bail
e
y
g
it-mergetool documentaiton: s
h
ow too
l
names in type
w
riter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Add a
very
b
asic test scri
p
t for git merge
t
o
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach git merge
t
oo
l
to use c
u
stom c
o
mmands
d
efin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Changed an in
t
ernal var
i
a
ble of mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Tidy up
git me
r
getool's backu
p
file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es Bailey
gitk: F
i
x the Makefile to c
o
pe with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
harle
s
B
a
iley
Re
m
ov
e
old generated files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles B
a
iley
Fi
x
g
i
t
-instaweb b
r
eakage on
MacOS X due to t
h
e limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Cha
r
les B
a
i
l
ey
Fi
x
clone not to ignore depth when perf
o
rming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree