repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: Add support for Apple Mac OS X's opendiff command
2007-03-29
Theod
o
re Ts'o
mergetool
:
Add support for Apple Mac OS
X
'
s
opendif
f
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
T
s
'
o
mergetool: Fix abort command when res
o
lving symlinks
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
odore Ts'o
me
r
ge
t
oo
l
: Remov
e
spurious
e
rror message
if merge
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: factor
o
ut common cod
e
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
erg
e
tool: po
r
tability fix: don't use reserve
d
word
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
mergetool: por
t
ability fix: d
o
n't a
s
su
m
e
true is
in
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
merget
o
o
l: Don't error out in the
merge
c
ase wher
e
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mer
g
etool: Replace use o
f
"ech
o
-n" with printf(1)
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore
T
s'
o
Fix minor formatting issue in man page
for git-mer
g
etool
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
Th
e
odore Ts'o
mergetool: print an appropr
i
ate
w
arning
if merge
.
t
o
ol
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
James B
o
wes
mergetool: Add support for v
i
mdiff
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-14
Theodore T
s
'o
Add
git-
m
e
rgetoo
l
to ru
n
an appropriate m
e
rge conflict
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree