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
M
cGee
[PATCH] gi
t
-merge
t
ool: Allow
gvimdiff
t
o be used as
.
.
.
Acked-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
mergetoo
l
:
C
l
e
an up description of files
a
nd prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merget
o
ol
:
Make
git-
r
m qui
e
t
w
hen re
s
ol
v
ing a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
mergetool: Add suppo
r
t for Apple Mac
O
S X'
s
opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
o
dore
T
s
'o
mergetool: Fix
a
b
ort com
m
and when resolving symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heod
o
re Ts'o
m
erg
e
tool: Remove s
p
urious er
r
or message
i
f merge
.
to
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
dore Ts'o
mergetoo
l
:
fact
o
r
out
c
ommon
code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merget
o
ol: porta
b
ility
fix
:
don't
use
r
eser
v
ed
wo
r
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
mergetool: portability fix: don't
a
ssume tru
e
i
s
in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts
'
o
mer
g
et
o
ol: Don't error out in
the mer
g
e
case wh
e
r
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'o
merge
t
ool: Replace
u
se of "echo
-
n" with printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
o
re
T
s'o
Fix m
i
nor formatti
n
g issu
e
i
n
man page for git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
T
h
eodore Ts'o
mergetool: print
an appropriate war
n
i
ng
if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
James Bowe
s
m
ergeto
o
l: Ad
d
support for vimdiff
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
T
heodore T
s
'
o
Add git-me
r
geto
o
l to run an a
p
p
ropriate merge
c
onflic
t
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree