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
mergetool: Remove spurious error message if merge.tool config option not set
2007-03-29
The
o
dore Ts'o
mergetoo
l
:
Remo
v
e spurious error mes
s
age if
merg
e
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dor
e
Ts'o
m
e
r
g
etool:
fact
o
r out common
code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts
'
o
m
ergetool: portabili
t
y
fix:
d
on't use reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
e
rgetool
:
portability
f
ix: don't a
s
sume true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
mergetool: Don't error out
i
n
the
merge
c
ase where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
o
r
e Ts'o
mer
g
etool: Replace use of "ec
h
o -n" with printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fi
x
minor f
o
rmatti
n
g
iss
u
e
in ma
n
page for
g
i
t
-
merg
e
tool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Th
e
odore Ts
'
o
mergetool:
pri
n
t an appropriate warning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
James
Bowes
mergetool: Ad
d
support
f
or vimdi
f
f
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
T
heodore Ts'o
Add git-m
e
rgetool to run
a
n
a
pp
r
opriate merg
e
conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree