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
submodule, repack: migrate to git-sh-setup's say()
2009-05-25
Charl
e
s Bailey
Ch
a
ng
e
xdl_merge to g
e
nerate output ev
e
n for
n
ull merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
t602
3
:
merge-fi
l
e fa
i
ls to ou
t
put
a
n
ything
fo
r
a degenerat
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles
Bailey
mergetool
:
fix
r
unning mergetool in
s
ub-
d
irecto
r
i
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bail
e
y
mergetool: Add
a tes
t
for running mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
mergetoo
l
:
respect autocrlf by using chec
k
ou
t
-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rl
e
s Bailey
mer
g
etool: Don'
t
keep temporar
y
m
erge
f
ile
s
u
n
less
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Bailey
mergetool: Add
prompt to co
n
tinue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Baile
y
Ad
d
-
y
/--no-prompt option t
o
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
ley
Fix some
tab/spa
c
e
i
n
c
onsist
e
ncies in g
i
t-m
e
rgetool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
gi
t
-archive: wo
r
k in bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
M
a
ke
git archiv
e
respect core
.
autocrlf
w
hen creat
i
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les
Bailey
Add ne
w
test
t
o
de
m
on
s
trat
e
git archive
c
ore
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
a
iley
merge-tool documentation
:
describe c
u
stom
comman
d
us
a
ge
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-merge
t
o
o
l
documentaiton: show toolnames in typew
r
iter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ail
e
y
Ad
d
a
v
ery basic test script for git mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Teach git
merg
e
t
o
o
l to use custo
m
commands
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
Cha
n
ged
an
i
nternal va
r
iable of me
r
getool
t
o sup
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
l
e
s Bai
l
ey
Tidy
u
p g
i
t mergeto
o
l's
b
a
c
ku
p
file
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
rles B
a
iley
gitk: F
i
x the Makefile to cope
w
i
t
h systems lack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charle
s
Bai
l
ey
Remove old generated files from
.
gitignor
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
arles Bailey
Fi
x
git-instawe
b
break
a
ge on MacOS X due to
the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
F
ix clone no
t
to ignore depth when performi
n
g a
loca
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree