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
fetch-pack: close output channel after sideband demultiplexer terminates
2009-05-25
Char
l
es Ba
i
ley
Chang
e
xdl_merge to generate output even for nu
l
l
merg
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bailey
t6023: merge-file fails
to
outpu
t
a
nythi
n
g
f
o
r a deg
e
nerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
l
es
Bailey
mer
g
e
t
ool: fix
r
unning mergeto
o
l
i
n
s
ub-director
i
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
i
l
e
y
merg
e
tool: Add a
t
est for
runn
i
ng mer
g
etool in a
s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bai
l
e
y
mergetool:
respect aut
o
c
rlf b
y
us
i
ng c
h
eckou
t
-in
d
ex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s Bailey
mergetool:
Don'
t
keep t
e
mp
o
rar
y
m
e
rge f
i
l
e
s
unl
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Bailey
mer
g
etool
:
Add promp
t
to co
n
tinue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no-p
r
ompt option t
o
me
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some t
a
b/space in
c
ons
i
stencies in git-merg
e
tool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Cha
r
les Ba
i
ley
gi
t
-archive:
work in
bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
M
ake git archive
respec
t
core
.
aut
o
crlf wh
e
n c
r
e
a
t
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Add new t
e
s
t
to
d
e
monstrate git archive
c
o
r
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
ley
merg
e
-to
o
l
d
ocumentation: descri
b
e
c
u
stom c
o
mmand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es
B
ailey
git-
m
ergetool
d
oc
u
m
enta
i
t
o
n: show tool
n
ames
in typewr
i
te
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Add a
very ba
s
ic
t
est sc
r
ipt for git mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Baile
y
T
e
ach git mergetool
t
o u
s
e cus
t
om commands d
e
fined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ai
l
ey
Change
d
a
n
internal variable
o
f merg
e
tool
to suppo
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
Tidy up git mergeto
o
l's backup f
i
le behaviou
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es Bailey
gitk
:
Fix t
h
e Mak
e
fi
l
e to
c
ope
wi
t
h
s
ystems lack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Re
m
o
ve old gen
e
rated files
f
rom
.
g
i
tign
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
ha
r
les Ba
i
l
e
y
Fix git
-
instaweb breakage on Ma
c
OS X due to the
l
imited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charl
e
s Bailey
Fix cl
o
ne not to ignore depth
w
hen performi
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree