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
t6023: merge-file fails to output anything for a degenerate merge
2009-05-25
Charles
Bailey
t6023: merge-file fa
i
ls
t
o
out
p
ut
a
nything for
a
degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
arles Bailey
git-
a
rchi
v
e: work in bare
r
e
p
os
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les Bai
l
ey
Make git archive
r
e
spect core
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es Bail
e
y
Add
n
ew
t
est to demon
s
tra
t
e git arch
i
ve core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Ba
i
l
ey
merge-tool documen
t
a
t
ion: describe custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es Bailey
git-mergetool documentaiton:
s
h
ow tooln
a
m
es in t
y
p
e
writer
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add
a
v
ery
b
a
s
ic test script for
g
it me
r
ge
t
oo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Teac
h
git m
e
rgetool to
u
s
e custom comm
a
nds d
e
fin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Changed a
n
internal vari
a
ble
o
f
merget
o
ol to s
u
pport
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up git merg
e
tool's backup fi
l
e
b
e
h
avi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fix th
e
M
a
kefile
t
o cope with s
y
s
t
ems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove old gen
e
r
a
ted f
i
les from
.
gi
t
ign
o
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles B
a
iley
Fi
x
git-instaweb breakage on MacOS
X
due
t
o the limi
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harles Bai
l
ey
Fix clone n
o
t to
ignore depth when performing
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree