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
cvsimport: Improve documentation of CVSROOT and CVS module determination
2007-03-31
Theodore Ts'o
Rename warn()
t
o warn
i
ng() to fi
x
sym
b
ol conflic
t
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
mergetool: Clean
u
p description of file
s
and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Make git-
r
m quiet when r
e
solving
a de
l
eted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
mergetool: Add s
u
pport for Appl
e
M
a
c OS X's o
p
e
n
diff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodor
e
Ts'o
mergetool
:
Fix abort co
m
mand when
r
esolving symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
merg
e
t
ool:
Re
m
o
ve s
p
u
r
i
ous
e
r
ror mes
s
age if merge
.
t
o
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
ergetool: fa
c
tor
o
u
t
commo
n
code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool
:
portabili
t
y fix: don't use
r
e
serv
e
d wo
r
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'
o
merge
t
ool: p
o
rtability
fix: don't assume true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
T
s'o
mergetool: D
o
n't error
out in
t
h
e
me
r
g
e case
wh
e
re
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
m
e
rgetool: Replac
e
use of "
e
c
h
o
-n" wi
t
h printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fix mino
r
f
o
r
matting iss
u
e in man pag
e
for gi
t
-
mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
T
h
eodore
Ts
'
o
mergetool: print a
n
appropria
t
e warning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
The
o
dore Ts'o
Add git-mergetool to
run an appropriate mer
g
e conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
T
h
eodore Ts'o
Ad
d
d
efinit
i
on
o
f
<commit-i
s
h>
to the main
g
i
t man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
h
eodore
Ts'o
Allow git-remote to update named groups of remo
t
es
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Th
e
od
o
re Ts'o
A
d
d con
f
ig_boolean() metho
d
to the Git perl
mod
u
l
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
h
eodore Ts'
o
Teach git-remote to update existing remo
t
es by fetch
i
ng
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
heodore
T
s
'
o
Allow aliases to e
x
pand to sh
e
ll c
o
mman
d
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theod
o
re Ts'o
Print a sa
n
e error message if an a
l
ias e
x
pands t
o
an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Th
e
odore Ts'o
Fix
formatting f
o
r
urls section of fetch, pu
l
l
,
and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree