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: Add support for Apple Mac OS X's opendiff command
2007-03-29
Theodore
T
s'
o
mergeto
o
l: Add s
u
pport for
Apple Mac OS X's
o
pend
i
ff
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts
'
o
mer
g
etool: F
i
x abort com
m
and w
h
en resolving syml
i
nks
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
d
or
e
Ts'o
m
ergetool
:
Re
m
ove spuriou
s
e
rror mess
a
ge if merge
.
t
o
ol
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodor
e
Ts
'
o
mergetool: fact
o
r out common cod
e
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
mergetool: portability fix: don't use reserved word
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
mergetool:
p
o
rtabil
i
ty fix:
don't
a
s
sum
e
t
rue i
s
in
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
mergetool: Don't error
out in
the merg
e
case wh
e
re
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
The
o
do
r
e T
s
'
o
m
e
rgetool: Replace u
s
e of "echo -n" with printf(1)
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
The
o
d
o
re
Ts'o
Fix
m
i
nor formatting
i
ssue
in
m
an page fo
r
git-merget
o
ol
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts
'
o
me
r
geto
o
l: pr
i
nt a
n
appropriate
w
arning if merge
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-14
Th
e
odore Ts'o
Add gi
t
-
m
erg
e
tool to
run an appr
o
priate merge conflict
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-06
T
heodore Ts'o
Add
de
f
inition of <comm
i
t-ish> to t
h
e main
g
i
t
man
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-27
Th
e
odore Tso
Fix
g
it-show man pag
e
formatting in the
EX
A
MPLES se
c
tion
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
A
l
low git-remote to
u
p
d
a
t
e na
m
ed
groups of remo
t
es
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add confi
g
_bool
e
an() method to the Git perl module
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-20
Theodore Ts'o
T
each
git-remote to
upda
t
e existing
r
e
m
otes by fetching
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-11
T
heodore Ts'o
Allow
aliases to expand
t
o
shell comman
d
s
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-11
Theo
d
o
r
e
Ts'
o
Pr
i
nt a
s
an
e
error m
e
ssage if
a
n
alias expands to a
n
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-01-01
The
o
dore Tso
Fix formatting for urls section
of fetch,
pull,
a
nd
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2006-12-31
Theodo
r
e Ts'
o
Fix formatting for urls section of fetch, pul
l
,
and
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
