repo.or.cz
/
git
/
jrn.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
T
s'
o
mer
g
etool: Make git-rm quiet when resolving a delete
d
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
e
rgetoo
l
: Ad
d
suppor
t
for A
p
ple Ma
c
O
S X's
opendiff
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool:
F
ix abort
c
o
mm
a
n
d when resolving symlinks
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
The
o
d
ore
T
s'o
mergetool:
R
emove spur
i
ous error message if merge
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: fa
c
tor
ou
t
common code
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
o
re Ts'o
mergetool: portab
i
l
i
t
y
f
ix:
d
on'
t
use reserved word
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
merget
o
ol: portabili
t
y fix: don't assume true i
s
in
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odo
r
e Ts'o
m
e
rgetool:
D
on'
t
error out in t
h
e merge case where
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
m
ergetoo
l
: Repla
c
e us
e
of "ec
h
o
-n" with printf(1)
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'
o
Fix minor
forma
t
t
i
ng i
s
s
ue in man
page fo
r
git-merg
e
to
o
l
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
Theodore T
s
'o
mergetool: print an appropri
a
te warni
n
g if
m
e
rge
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-14
Theodor
e
Ts'o
Add git-
m
ergetool to r
u
n
an appropriate mer
g
e conflict
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
A
d
d definitio
n
of <c
o
m
m
it-i
s
h> to
th
e
main git man
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-27
Theod
o
re Tso
Fix git-show man
p
age formatting in the
E
XAMPLES
secti
o
n
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-21
T
heodore Ts'o
Allow git-remo
t
e
t
o update na
m
ed grou
p
s
of remotes
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-21
Theod
o
r
e T
s
'o
Add
c
onfig_
b
ool
e
an() method
to the Git perl
modu
l
e
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-20
Th
e
odore Ts'o
T
e
ach git-r
e
mote to update exis
t
ing remotes by fe
t
ch
i
ng
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-11
Theod
o
re Ts'o
A
l
l
o
w alia
s
es
to expand to sh
e
ll commands
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-11
The
o
d
o
re
Ts'o
Prin
t
a
sane e
r
ror message if an ali
a
s expands t
o
an
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-01-01
Theodor
e
Tso
F
i
x format
t
ing for urls sectio
n
of fetch, pul
l
, and
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
Fix
f
orma
t
ti
n
g for
u
rls section of
fe
t
ch, pull, and
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree