repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Simplify some instances of run_command() by using run_command_v_opt().
2009-05-25
Charle
s
Bailey
Change xdl_me
r
g
e
to gen
e
r
a
te
output e
v
en fo
r
n
ul
l
merg
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
Bailey
t
6
023: merg
e
-file fails to output anything for a degenera
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool
:
fix running mer
g
e
t
o
o
l
in sub-directo
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
B
ailey
m
e
rgetool: Add a te
s
t for
running me
r
getool in
a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles B
a
iley
mergetool: respect auto
c
rl
f
by
u
sin
g
chec
k
o
ut-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bail
e
y
m
ergetool: Don't keep t
e
mporary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
ergetoo
l
: Add pr
o
mpt to co
n
tin
u
e
after
faili
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
A
dd
-y/--no-p
r
ompt option to mer
g
etool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
rles
B
ailey
Fix
s
ome tab/space
incon
s
i
s
tenc
i
e
s
in git-m
e
rge
t
ool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles B
a
i
ley
g
it
-
a
r
chive: work in ba
r
e
r
epos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les Bai
l
ey
Make
g
i
t
archiv
e
r
espect
core
.
aut
o
crlf when c
r
ea
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles Bai
l
ey
Add
n
ew test to demonstrate git archive
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bailey
merge-
t
o
o
l docu
m
e
n
tation: d
e
scribe cu
s
t
om command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bailey
git-merg
e
tool documentaiton:
show to
o
lna
m
es in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles Bailey
Add a very basic test script for
g
it mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach git merg
e
tool
t
o
u
s
e cust
o
m c
o
mmands def
i
ned
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
i
ley
Changed an
in
t
ernal v
a
riable
o
f
merg
e
tool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up git
mergeto
o
l's
b
ackup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arle
s
Bailey
g
itk
:
F
ix the M
a
kefile t
o
cope with syst
e
m
s
l
a
c
k
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
har
l
e
s Bail
e
y
Remo
v
e old generated
f
iles from
.
g
itignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
ha
r
les Bailey
Fix gi
t
-instaweb breakage
o
n MacOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Cha
r
les Bailey
Fix c
l
one not
t
o ign
o
re
d
epth
w
hen perf
o
rming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree