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
Reimplement emailing part of hooks--update in contrib/hooks/post-receive-email
2007-03-31
Theo
d
ore Ts'
o
Rename warn(
)
to warni
n
g
(
) to fix symbol confli
c
t
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
merg
e
tool: Cle
a
n up
d
escri
p
ti
o
n of files and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re T
s
'o
mergetool: Make git-rm quiet when resol
v
ing a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
mergetool: Add
s
up
p
o
r
t
for App
l
e Mac OS X
'
s o
p
endi
f
f
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dor
e
Ts'o
mergetool: Fix abort comma
n
d
w
hen resolv
i
ng syml
i
nks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
me
r
getool: R
e
move spurious
e
r
ror message
if mer
g
e
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
mergetool: factor out
comm
o
n code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odor
e
T
s
'o
mergetool: porta
b
ility fix
:
do
n
't us
e
re
s
erved wor
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
mergetool
:
porta
b
ility
fix
:
d
o
n'
t
assume true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
m
ergetool: Don't error ou
t
in the merge
case wher
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odor
e
Ts'o
m
e
rgetool: Replac
e
u
s
e
o
f
"ec
h
o -n" wit
h
pri
n
t
f
(
1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
d
o
r
e
T
s'o
Fix minor
f
o
rmatting i
s
sue
i
n man
p
age for git-mergeto
o
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
merg
e
tool:
p
rint an appropriate
wa
r
ning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
T
heodore Ts'o
Add git-mer
g
etool to run an
a
pprop
r
i
a
t
e merg
e
conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
Ad
d
definitio
n
o
f
<commit
-
ish> to the main
git
man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Allow git-remot
e
to update n
a
med gr
o
up
s
of re
m
otes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore T
s
'o
Ad
d
con
f
ig_b
o
olean() method to t
h
e
Git p
e
r
l module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theo
d
ore Ts'o
Tea
c
h
git-rem
o
t
e to update exist
i
ng re
m
o
t
e
s by f
e
tching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
heodore Ts'o
Allow aliases to
e
x
p
a
n
d to shell c
o
m
m
ands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Print a sane e
r
ror me
s
sag
e
if an alias expand
s
to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
T
h
eodore Ts'o
Fix formattin
g
f
o
r
u
r
l
s s
e
ction
o
f
fetch, pull
,
a
nd
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
