repo.or.cz
/
git
/
dscho.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
m
ergetool: Ma
k
e gi
t
-rm qui
e
t whe
n
resol
v
ing
a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
he
o
dore Ts'o
mergetool: Add s
u
pport for App
l
e Mac OS X's open
d
if
f
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odo
r
e
T
s
'o
mergetool:
Fix abort comman
d
whe
n
resolving sym
l
inks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Remove s
p
urious error mess
a
ge
i
f
merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore
Ts'o
mergetool: facto
r
o
u
t
c
ommon code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore
Ts'o
mergetool: portability fix:
d
o
n
't use reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
merget
o
ol: portability
f
ix:
do
n
't a
s
sum
e
true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Don't error out in
the m
e
r
g
e case
w
h
ere
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odo
r
e
Ts'o
mergetool: Replace use of "echo -n" with printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'
o
Fix
minor
formatting issue
in man pag
e
for
g
i
t-
m
ergeto
o
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore
T
s'o
mergetool: p
r
int an appr
o
p
r
iate warning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
Add git-mergetool to run an appro
p
ria
t
e merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
Add d
e
finition of
<comm
i
t-ish> to the
main
git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theod
o
re Ts'o
Al
l
ow git-remote to update name
d
group
s
of
rem
o
tes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add config_boolean() met
h
od to the Git
p
erl
m
odule
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore T
s
'o
Tea
c
h gi
t
-r
e
mote
t
o up
d
at
e
existing rem
o
tes b
y
fetchi
n
g
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodor
e
T
s'o
Allow alias
e
s
t
o
expand to sh
e
l
l
commands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
e
o
do
r
e Ts'o
Pr
i
n
t
a sane error messa
g
e if an a
l
ias expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theod
o
re Ts'o
Fi
x
formatting for urls
s
ection of fe
t
ch, p
u
ll, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
