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
Theodore Ts'o
mergetool
:
Make git-rm quiet when resolving
a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
mergetool: Add support for App
l
e
M
ac
OS X's opendif
f
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool
:
Fix abort
c
ommand whe
n
r
e
solv
i
ng symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
e
rgetool:
Remove
s
purious e
r
ror m
e
ssage
i
f
m
er
g
e
.
t
ool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
od
o
re Ts'o
mer
g
et
o
ol: factor out
common
c
ode
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts
'
o
me
r
ge
t
ool: p
o
rtability fix: don't
use
reserve
d
word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
me
r
ge
t
ool: port
a
bil
i
ty fix: don't ass
u
me tr
u
e is i
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mer
g
e
t
ool: Don't error
o
u
t in
t
he me
r
ge case whe
r
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
o
d
o
re Ts'o
mergetool: Replace use of "echo -n"
w
ith printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fix minor for
m
att
i
ng issue in man
page for git-merg
e
tool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
The
o
d
o
re
Ts'o
mergetool: print an appropr
i
ate warning
if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
The
o
dore Ts'o
Add
git-m
e
rge
t
ool to run an app
r
opriate
merge conf
l
i
ct
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
T
h
eodore Ts
'
o
Add definition of <com
m
it
-
ish
>
t
o
the main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
The
o
d
ore Ts'o
Allow git-remote to
u
pdate named gr
o
u
p
s of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
The
o
dore
T
s'o
Add config_boo
l
e
an() method to
t
he Git
p
e
r
l module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
heodore Ts'o
Teach git-re
m
ote
t
o upd
a
te existing remo
t
es by fetching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Al
l
o
w ali
a
ses to expand to shell command
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
eodore Ts'o
Print a sane error me
s
sage i
f
an alias
e
xpands
to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
Fix formatting for url
s
section
of fetch, pull
,
and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
