repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sp/cvsexport'
2007-05-09
T
heodo
r
e
Ts'o
Increa
s
e p
a
ck
.
d
e
p
th default to 50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
The
o
dore Ts'o
Ad
d
pack
.
dept
h
option to g
i
t-pack-objects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theodo
r
e Ts'o
Rename warn() to wa
r
ning()
to
fi
x
symbol confl
i
cts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
mergetool: Clean up descr
i
ption
o
f fi
l
es
and pr
o
mpts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Make gi
t
-rm quiet
when resolving a de
l
e
ted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore
T
s'o
mergetool: A
d
d suppo
r
t f
o
r Apple Mac OS X's o
p
endiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'
o
mergetool: Fix abort co
m
mand
w
hen r
e
solv
i
ng
s
ymlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Remov
e
s
p
u
r
i
o
us error
m
es
s
ag
e
if merge
.
t
o
ol
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
mergetool
:
facto
r
out commo
n
code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
m
e
rgetool: porta
b
i
lity
fi
x
: don't u
s
e reser
v
ed word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
do
r
e Ts'o
mergetool: portability fix
:
don't as
s
ume
t
ru
e
is i
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
mer
g
e
tool:
D
on't error out in the m
e
rge c
a
s
e where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'
o
mergetool: Replace use
of "echo -n"
w
ith printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
T
s'o
Fix mi
n
or format
t
in
g
issue i
n
man pag
e
for
g
it
-
m
e
rgetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
me
r
getool: print an appropri
a
te warning if m
e
rge
.
to
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
A
d
d git-
m
ergetool to run an
a
ppropri
a
te
merg
e
con
f
lict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
T
h
eod
o
re Ts'
o
Add defin
i
tion of <co
m
mi
t
-
i
sh> to
the
main
g
i
t
man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Th
e
od
o
re Ts'o
Allow git-remo
t
e to upda
t
e
named groups of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theo
d
ore Ts'o
Add
c
onfig
_
bool
e
a
n
() m
e
thod to the Gi
t
perl m
o
dule
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore T
s
'
o
Te
a
ch g
i
t-remote
t
o u
p
dat
e
exist
i
ng remotes
b
y
fetch
i
ng
.
.
.
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
mma
n
ds
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
e
odore Ts'o
Print a sa
n
e
error messa
g
e i
f
an
alia
s
expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
T
heodore Ts'o
Fix
f
ormatting for urls s
e
ction of f
e
tch, p
u
ll, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree