repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cvsserver: Handle re-added files correctly
2007-03-31
Theod
o
re Ts'o
Ren
a
m
e
warn
(
) to warni
n
g
() to fix symb
o
l con
f
l
ict
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theo
d
ore Ts'o
mergetool
:
Clean up description of f
i
les an
d
pr
o
mpts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetoo
l
: M
a
ke
git-rm quiet
w
hen
r
esolving
a
deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
mer
g
etool: Add support for Ap
p
le Mac
O
S X's ope
n
diff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
erg
e
tool: F
i
x
a
bort command when re
s
olving symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetoo
l
: Remove spurious err
o
r
message if
m
e
r
ge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'o
mergetool: fact
o
r out commo
n
code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
m
e
rgetool:
p
ortability
fix: don
'
t
use reser
v
ed word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
m
e
rgetool:
portab
i
l
ity fi
x
:
d
o
n't
a
s
sume true is
in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts
'
o
mergeto
o
l:
D
on't error out
i
n th
e
merge case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
mergetool: Rep
l
ace use of "echo -n" with prin
t
f
(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fix minor formatting issue
i
n man page f
o
r
g
i
t-me
r
getool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore
T
s'
o
m
e
rg
e
tool: prin
t
a
n
appropr
i
ate 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
Ad
d
git-merget
o
ol to run an appro
p
riate merge c
o
nflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Th
e
odore T
s
'
o
Add definition of <com
m
it-ish> to the main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore T
s
'o
Allow
git
-
r
e
m
o
te
to update
na
m
e
d grou
p
s o
f
r
e
motes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
heodor
e
Ts'o
Add co
n
f
ig_boolea
n
() method t
o
the G
i
t
p
erl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
h
eodore Ts'o
T
each git-remote t
o
update exi
s
ting
r
e
motes by
fetching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts
'
o
Allow aliases to expand to shell c
o
mmands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
eodor
e
Ts'o
Print a sane e
r
ror me
s
s
age if an alias
e
xpands
t
o an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodo
r
e Ts
'
o
Fix f
o
rmatting fo
r
urls
se
c
tio
n
o
f
f
e
tch, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree