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
builtin-remote: Make "remote show" display all urls
2009-05-25
Charles B
a
i
ley
Change xdl_merge to
generate out
p
u
t
even fo
r
n
ul
l
merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: m
e
rge-file fail
s
t
o
output anyt
h
i
n
g fo
r
a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
il
e
y
mergetool:
f
ix running merget
o
ol in su
b
-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
rles Bailey
merge
t
ool: Add
a
t
e
s
t
for running
m
ergetool
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merget
o
ol: respect autoc
r
lf by using checkou
t
-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s
Bailey
mergetool: Don
'
t
keep t
e
mpor
a
ry m
e
rge fi
l
es u
n
less
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Ba
i
ley
mergetool: Add
p
r
om
p
t to c
o
ntinue
a
f
ter f
a
iling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bailey
Add -y/--n
o
-prompt o
p
t
ion to me
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some
tab/space inconsistencies in git
-
m
erg
e
tool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
g
i
t-archive: w
o
rk in
b
a
re re
p
os
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arl
e
s B
a
i
ley
M
a
ke
g
it archive
respect
core
.
a
u
tocrlf w
h
en creati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
a
r
l
es
B
ailey
Add new test
t
o dem
o
n
strate g
i
t arc
h
ive core
.
autoc
r
lf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bai
l
ey
merge-to
o
l doc
u
mentation:
describe custom command usag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
g
it-mergetool documentaiton: show toolnames in typewr
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Add a ve
r
y ba
s
ic test script for git m
e
rg
e
t
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
e
ach gi
t
merge
t
ool
t
o
use
custom command
s
def
i
ned
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Changed
an int
e
rnal vari
a
ble
o
f
mergetoo
l
to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
i
l
ey
T
i
dy up git me
r
geto
o
l's backup file be
h
aviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Cha
r
l
es Bailey
gitk: Fix the M
a
kef
i
l
e to cop
e
with
s
ystems
lack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Cha
r
les Bail
e
y
Rem
o
ve
old genera
t
ed files from
.
g
i
tigno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bai
l
ey
Fix
g
it-
i
nsta
w
eb br
e
ak
a
g
e on Mac
O
S X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone
n
ot to ignore de
p
th when p
e
rforming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree