repo.or.cz
/
git
/
ljr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
do_one_ref(): null_sha1 check is not about broken ref
2009-05-25
Ch
a
rles Bailey
Change xdl_merge to generat
e
o
u
tput
even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t
6
023: merge-
f
ile fails
t
o
output
anyth
i
ng f
o
r a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arle
s
Bailey
mergetool: fix ru
n
ning me
r
getool in sub-d
i
re
c
tories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
Bailey
mergeto
o
l: Add
a tes
t
for runn
i
ng
merge
t
ool in
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
harl
e
s Bailey
me
r
geto
o
l
: respect aut
o
crl
f
by using
c
h
e
ckout
-
index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
rles Ba
i
ley
m
e
r
getool: Don't
keep
t
emporary m
e
rge files un
l
ess
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
ey
mergetool:
A
dd prompt to contin
u
e after
failin
g
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bailey
Ad
d
-y/--no-
p
rompt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
e
s Bailey
Fi
x
s
o
me tab/spa
c
e inc
o
nsistencies in git-m
e
rgetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
rles Bailey
git-archi
v
e: work in bare r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
ley
Make git archive respect core
.
autocrl
f
wh
e
n cre
a
ting
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les Bailey
Add new test
t
o demonst
r
ate g
i
t
archi
v
e co
r
e
.
a
utocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-too
l
documentatio
n
: describe custom c
o
mmand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
iley
git-mergetool documentaiton:
show toolnames i
n
typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add
a very basic te
s
t script for git
m
e
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Te
a
ch git mergetoo
l
to u
s
e custom comm
a
nds defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Changed an internal v
a
r
iable of mergetoo
l
to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
Tidy
u
p
git mergetool's
backup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
r
le
s
Bail
e
y
g
i
tk: Fix the Make
f
i
l
e
t
o c
o
p
e with
s
ystems lackin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charle
s
Bai
l
ey
Remove
ol
d
generated file
s
from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-instaweb breakage on Mac
O
S X due to
the
limite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clon
e
not to ignore depth when perfor
m
ing
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree