repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
send-email: remove debug trace
2009-05-25
Charles Bailey
Change
x
dl_mer
g
e to
g
enerate
o
utput even for
null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Baile
y
t6023:
m
erge-file fails t
o
output anyt
h
ing for a degene
r
ate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les Baile
y
m
e
rgetool: fix running merge
t
o
ol in
s
ub-directorie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
B
a
i
ley
mergetool: Ad
d
a test for running mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
harles Bailey
mergetoo
l
:
respect au
t
oc
r
l
f
b
y
using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool:
D
on
'
t
keep temporary mer
g
e files
u
nle
s
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Bailey
mergetool: Add prompt to conti
n
u
e after
fa
i
ling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
B
ailey
A
d
d
-y
/
--no-pr
o
mpt option to
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
e
s Bailey
Fix some tab/s
p
ace inc
o
nsistencies in git-mergetoo
l
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Char
l
es Ba
i
ley
g
i
t-arch
i
ve:
w
ork in
b
a
re re
p
os
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make
g
it arch
i
ve
r
espect core
.
autocrlf when
c
re
a
ting
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
iley
Add n
e
w te
s
t
to demons
t
rate git archive
co
r
e
.
a
utocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
ley
merge-tool documentatio
n
: d
e
scribe custom command
u
sage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bailey
git
-
me
r
getoo
l
d
o
c
umentait
o
n:
show toolnames in type
w
riter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harle
s
Bailey
Add a very basic test script f
o
r git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
each g
i
t
mergetool to use custom comman
d
s
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles B
a
iley
C
hanged a
n
in
t
ernal v
a
riable of
m
erge
t
o
o
l to s
u
pport
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Baile
y
Tidy up git me
r
getoo
l
's backup fil
e
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
B
a
i
ley
gitk: Fix th
e
M
a
kefile to cope
w
i
t
h systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remov
e
old generated
file
s
from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-instawe
b
br
e
aka
g
e on MacOS X
d
ue
to the
limit
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Char
l
es Bailey
Fi
x
clo
n
e not to ignore depth when
p
e
rforming a l
o
ca
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree