repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Mergetool generating blank files (1.5.3)
2007-09-29
Junio C Hamano
Merget
o
o
l
generating blank files (
1
.
5
.
3)
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
T
h
eodore Ts'
o
git-mer
g
etool: M
a
ke default
s
election of me
r
ge
-
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
Dan McGee
[PATCH] git-mergetool: Allow gvimdiff to be used as
.
.
.
Acked-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodo
r
e Ts'o
me
r
getool: Clean up
d
escriptio
n
o
f
files
and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s
'o
mergetoo
l
:
Make git-rm qui
e
t when resolvi
n
g
a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetoo
l
: Add support for Apple Ma
c
OS X
'
s opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
mergetool: Fix abort command when resolving sym
l
inks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
T
s
'
o
mergetoo
l
: Remove spurious error mess
a
ge if m
e
rge
.
t
ool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
mergetool: factor
out common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'o
mergetool:
portability fix:
don't use
reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
r
e
Ts'o
mergetool:
p
ortability fix: don't assume
t
rue is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
ergeto
o
l:
D
o
n'
t
error o
u
t
i
n the
m
e
r
ge
case w
h
ere
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
m
erget
o
ol: Rep
l
a
c
e use of "echo -n" w
i
th 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
rmatting issu
e
in
m
an p
a
ge for git-merge
t
ool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theo
d
ore Ts'o
mergetoo
l
: print an appropriate warning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Ja
m
e
s
Bowes
merge
t
ool: Add
s
upport for vimdiff
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Th
e
odore Ts'
o
Add git-mergetool to run an
appropriate merge confl
i
ct
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree