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: Make git-rm quiet when resolving a deleted file conflict
2007-03-29
Theodor
e
Ts'o
mergetool: Make
git-rm q
u
iet when re
s
o
l
v
ing a
dele
t
ed
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
me
r
g
et
o
ol: Add support for App
l
e Ma
c
OS
X
's opend
i
ff
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
me
r
getool:
Fix abo
r
t command when res
o
l
vi
n
g
sym
l
inks
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
or
e
T
s'o
mergetool: Remove spu
r
i
o
us error message i
f
m
erge
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetoo
l
: factor out comm
o
n code
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
mergetool:
p
ort
a
bilit
y
fix: don't
us
e
reserved word
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eod
o
re Ts'
o
merget
o
ol:
portability fix: don't assume
tru
e
is i
n
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
m
ergetoo
l
: D
o
n't error out in the merge case
whe
r
e
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
erget
o
ol:
R
eplace use of "echo
-
n" with p
r
intf(1)
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
Fix
m
inor formatting issue in ma
n
page
f
or
git-m
e
rg
e
tool
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
mergetoo
l
: print an
a
p
p
r
o
priate warning if
merg
e
.
too
l
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
James Bowes
me
r
getool: Add support for vimdiff
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-14
Th
e
o
dore Ts'
o
A
d
d git-mergetool
t
o run
a
n
a
pp
r
opriate me
r
ge conf
l
ict
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree