repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool
2007-06-10
Dan McGee
[PATCH] git-merge
t
ool: Allow gv
i
mdiff to be used as
.
.
.
Acked-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
me
r
getool
:
Clean up descri
p
tion of files and
p
rompts
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
d
ore Ts'o
m
ergetool: Mak
e
git
-
r
m quiet when reso
l
vi
n
g
a de
l
e
ted
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
mergetool: A
d
d
suppor
t
for Ap
p
le Mac
O
S X
'
s opendif
f
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'
o
mergetool: Fix ab
o
rt
c
o
m
m
and
w
h
e
n resolv
i
n
g sy
m
li
n
k
s
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
o
dor
e
Ts'o
mergetool: R
e
m
o
ve spurious error message if merge
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: factor out c
o
mmon code
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mer
g
etoo
l
: portability f
i
x:
d
on
'
t use
r
eserve
d
word
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
mergetool: port
a
bil
i
t
y fix: do
n
't assume true is i
n
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
The
o
d
o
r
e
T
s'o
mergetool: Don't error out
i
n
the me
r
ge cas
e
where
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
mergetool:
R
eplace use of
"
ech
o
-n" with
prin
t
f(1)
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
Fix min
o
r formatting i
s
sue in man page
for git-m
e
r
g
e
tool
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
m
ergeto
o
l: print an appropriate
w
arning if merge
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
James B
o
w
e
s
mergetool
:
Add
s
upport for vimdiff
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-14
T
h
eodore Ts'o
A
dd
git-mer
g
etool to
run an
appropri
a
t
e
me
r
ge
c
o
n
flict
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
