repo.or.cz
/
git
/
git-svn.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 H
a
mano
Mergeto
o
l gener
a
ting blank files (1
.
5
.
3
)
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-06-10
Theodore Ts'o
git-mergeto
o
l:
Make default selection of merge-tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-06-10
Dan McGee
[PATCH] git-merge
t
ool: Allow g
v
imdiff to be used a
s
.
.
.
Acked-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
merge
t
o
o
l
: Clean
u
p d
e
scription o
f
files and pro
m
pts
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
mergetool: Make
git-rm qui
e
t w
h
en resolving a
deleted
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts
'
o
merg
e
tool:
Add
s
uppor
t
fo
r
Apple Ma
c
OS X's o
p
endiff
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
mergetool
:
Fix abort
c
ommand
w
hen re
s
olving symlinks
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergeto
o
l: Rem
o
v
e
spu
r
ious e
r
r
o
r mes
s
ag
e
if mer
g
e
.
t
ool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
heodor
e
Ts'o
merget
o
ol: fa
c
tor out comm
o
n
code
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool:
p
ortab
i
l
ity fix:
d
on't use reserved w
o
rd
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool:
p
o
rtability fix: don'
t
assume tr
u
e is in
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
dore Ts'o
mergetoo
l
: Don't error o
u
t in the me
r
g
e
c
ase
w
h
ere
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
mergetool:
Replace us
e
of "echo
-n" with pr
i
ntf(1)
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts
'
o
Fix
m
inor formatti
n
g
issu
e
in man
pag
e
fo
r
git-mergetool
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
Th
e
odore
T
s'o
mergetool: p
r
i
nt an
appropr
i
ate wa
r
ning if mer
g
e
.
t
o
o
l
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
James Bowes
merge
t
ool: Ad
d
support for vimdiff
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
Add git-mer
g
etool to ru
n
a
n appropria
t
e merge conflict
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree