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
Theodore Ts'o
mergetool: Rem
o
ve spu
r
ious error messa
g
e
i
f
merg
e
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
o
dor
e
T
s'o
mergetool
:
facto
r
out c
o
mmon code
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
heo
d
ore Ts'o
mergetoo
l
:
p
ortability fix: don't use
re
s
e
rved word
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
m
ergetool: por
t
ability fix: don't assume tr
u
e
is i
n
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Don't error
out in the merge case where
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merget
o
ol: R
e
pla
c
e
use
of "echo -n
"
with prin
t
f(1)
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fix minor fo
r
matt
i
n
g issue in man page
f
or git-mergetool
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
T
h
e
odore
Ts'o
m
erge
t
ool:
p
rint
an app
r
o
p
riate warnin
g
if mer
g
e
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
James Bow
e
s
merget
o
ol: Add
s
upport for vi
m
diff
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-14
Theodore T
s
'o
Add
g
it-mergetool to run
an appropriate merge
c
o
nflict
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree