repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t/t4018: avoid two unnecessary sub-shell invocations
2010-08-20
C
harles Bailey
merg
e
tool: Remove
exp
l
icit refe
r
ences
t
o /
d
ev/
t
ty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles B
a
iley
s
t
ash tests: s
t
ash
can lose
d
a
ta in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bai
l
e
y
stash: Don't overwrite files that have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Ba
i
ley
Docum
e
ntation: Describe
other situation
s
w
h
e
re -z af
f
ects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_merge to generate output even
f
or null mer
g
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charle
s
Bai
l
ey
t6023: me
r
ge-file
f
ails to output anything
for
a
deg
e
nerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
e
y
m
ergetool:
f
ix running merget
o
ol i
n
sub-d
i
r
ectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
m
e
rgetool: Add a test for runn
i
ng m
e
rgetool
i
n a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
mergetool: respect au
t
ocrlf by
usi
n
g checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles B
a
i
ley
mer
g
etool: Don't keep temporary
m
e
r
ge files unles
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Add prompt
t
o
c
ontinue
after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bailey
Add
-
y
/-
-
no-pr
o
mpt
o
p
t
i
on t
o
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
r
les Ba
i
l
ey
Fix
s
ome tab/s
p
ace inconsiste
n
cies
i
n git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
harles Bailey
g
it-a
r
c
hi
v
e: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Ba
i
ley
Make git archive resp
e
ct core
.
autocrlf when crea
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Add new te
s
t to d
e
mo
n
strate g
i
t a
r
chi
v
e core
.
autoc
r
lf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bail
e
y
merge-tool docume
n
tation: descri
b
e
custom c
o
mmand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
B
a
iley
git-
m
erge
t
o
o
l documen
t
aiton: show toolnames in typewr
i
t
e
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
ar
l
es Ba
i
ley
Add
a
v
e
ry
b
a
s
i
c te
s
t script
for g
i
t
merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bail
e
y
T
e
a
ch git merg
e
tool to
u
s
e cus
t
om commands
d
efine
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Changed an in
t
ernal variable of mergetool to supp
o
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles
B
ai
l
ey
Tidy up gi
t
mer
g
e
t
ool's
b
ackup fi
l
e be
h
aviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bail
e
y
gitk:
F
ix the Makefile
to cop
e
w
i
th
systems l
a
cki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
ar
l
es Bailey
Remove old ge
n
erated
f
iles from
.
gi
t
ign
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles B
a
iley
F
i
x git-instaweb breakage
o
n MacOS X due to the limite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charle
s
Bailey
Fix clone not to
ignor
e
depth when performing
a
l
ocal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
