repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
perl: install private Error.pm if the site version is older than our own
2007-03-31
Th
e
odore Ts'o
Rename warn() to warning
(
)
to f
i
x
symbol co
n
fli
c
ts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodo
r
e Ts'o
mergetool: Clean u
p
description
o
f fi
l
es an
d
p
romp
t
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Mak
e
git-r
m
qui
e
t when resolvi
n
g a
deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore
T
s'o
mergetool: Add support for Apple Mac
O
S
X
'
s
opendi
f
f
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
mergetool: Fix abort comma
n
d
w
hen resol
v
ing symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eod
o
re Ts'o
me
r
getool:
R
em
o
ve
spurious error messag
e
if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts
'
o
mer
g
etool: fa
c
tor out common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
o
dore Ts'
o
merge
t
ool
:
portability fix
:
don't use r
e
served word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
mergetool: portab
i
lity fix: don't
a
ssu
m
e true
is
in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool:
D
on't error out in the merge case wh
e
re
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
merget
o
o
l: Replac
e
use
of "echo -n
"
with printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
Fix minor fo
r
m
a
tting is
s
ue in
man p
a
ge for git-me
r
getool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodo
r
e Ts'o
mergetool: print a
n
appropriate warning if merge
.
to
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theo
d
ore Ts'o
Add
g
it-mergetool to run an appropri
a
te merge
conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore
Ts'o
A
d
d definition of
<comm
i
t
-ish
>
t
o th
e
mai
n
g
it
m
an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodo
r
e
Ts'o
Allow gi
t
-
remo
t
e
t
o upda
t
e name
d
grou
p
s of
r
emotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
A
dd con
f
ig_
b
oolean() method to the G
i
t
p
er
l
modu
l
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Th
e
o
dore
Ts'o
Tea
c
h gi
t
-remote
to update existing remo
t
es by fetching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
The
o
dore
T
s'
o
All
o
w al
i
ases to
e
xpa
n
d
to shell c
o
mmands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theod
o
r
e
Ts'o
Pr
i
nt a
sane error message if an alias expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
Fix formatting
for
urls section of
fetc
h
, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree