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
Git 1.7.0.8
2010-04-18
C
h
arles Bai
l
ey
Do
c
umentation
:
D
e
scr
i
be
o
ther situatio
n
s where
-z af
f
e
c
ts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
Change xdl_merge to
g
e
nerate output
e
ven
f
or null merge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bailey
t60
2
3: merg
e
-file fails to outpu
t
anything for a degene
r
ate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bail
e
y
m
e
rgetool: fix running mergetool
i
n
sub-dir
e
ctories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
B
aile
y
mergetool: Add a test for
r
unni
n
g mer
g
etool in a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles B
a
iley
m
e
rgetool: respe
c
t au
t
o
c
r
lf by using checkout
-
index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arle
s
Bailey
mergetool: Do
n
'
t
keep temporary mer
g
e fi
l
es
un
l
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les Bailey
mergetool: Add pro
m
pt to cont
i
n
u
e afte
r
fai
l
i
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bail
e
y
A
dd -y/--n
o
-prompt option to mer
g
etoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bail
e
y
Fix some tab
/
space in
c
onsiste
n
ci
e
s
in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Cha
r
les Bailey
git-archive: wo
r
k
in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make g
i
t a
r
c
hive respect
c
ore
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles B
a
il
e
y
Add ne
w
t
e
s
t
to demonstrate gi
t
a
rchiv
e
cor
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es Bai
l
e
y
merge-to
o
l d
o
cumentation
:
des
c
ribe custom co
m
mand
u
sag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bai
l
ey
gi
t
-m
e
r
g
e
t
ool documentaiton: s
h
ow t
o
oln
a
mes in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
l
ey
Add a very basic tes
t
s
cript for git merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Baile
y
Teach
g
i
t
m
e
rgeto
o
l
t
o
u
se cust
o
m
commands define
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
C
h
anged
a
n
inte
r
nal
v
a
riable of mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Ba
i
ley
Tidy up git mergetool's ba
c
k
u
p file
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk:
Fix the Makefile to cope
wi
t
h
systems
l
a
cking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
r
les
B
a
iley
Remo
v
e old ge
n
er
a
t
ed file
s
from
.
git
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Ch
a
rles Ba
i
ley
Fix git
-
ins
t
aweb
breakage on M
a
c
OS X due to th
e
limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harles Bailey
F
i
x
c
lone not
t
o
i
g
no
r
e depth when
performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree