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 Ba
i
ley
t6
0
2
3: merge-file fails
t
o
output
anything for a
dege
n
erate
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
Charles
Bail
e
y
git-a
r
chive: work in bare repos
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ailey
Make git archi
v
e
r
espect core
.
autoc
r
lf whe
n
creati
n
g
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ailey
Ad
d
new
te
s
t to demonstrat
e
git a
r
chive c
o
re
.
a
utoc
r
lf
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool documentation: desc
r
ibe cust
o
m co
m
man
d
usage
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bailey
git-mergetool docum
e
ntaiton: show tooln
a
m
e
s in typewriter
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
B
aile
y
Add a very ba
s
ic test
script for git mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Ba
i
ley
Teac
h
git
merge
t
o
ol to use c
u
s
t
o
m
comma
n
ds de
f
ined
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
B
ailey
Changed an inte
r
nal va
r
iable of
m
ergetool to support
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
Ti
d
y
u
p
g
it mergetoo
l
'
s
backup file behaviour
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fix t
h
e Makefile t
o
cope with systems
lacki
n
g
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
r
les
Bailey
Remov
e
old
g
enerate
d
files fro
m
.
gitignore
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charles
B
ailey
F
ix git-inst
a
web breakage on M
a
cOS X due to the l
i
mite
d
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
F
i
x clone
n
ot
to igno
r
e dep
t
h w
h
en p
e
r
for
m
ing a loca
l
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree