repo.or.cz
/
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 'maint' to sync with 1.5.2.1
2007-05-31
Theod
o
re Ts'o
Fix
minor grammatical ty
p
os in the git-gc man pag
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore
T
s'o
I
ncrea
s
e pack
.
depth defau
l
t to
50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodor
e
Ts'o
Add
p
a
c
k
.
depth option t
o
git-pack-objects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theodore Ts'o
Rename w
a
r
n
() to warning() to fix
s
y
mbol confli
c
ts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
T
he
o
d
ore Ts'o
mer
g
etool: Cle
a
n up des
c
r
iption of files and pr
o
mpts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
me
r
getool: Make git-rm q
u
i
et wh
e
n
r
esol
v
i
n
g a del
e
ted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore
T
s'o
m
e
rgetool: A
d
d
s
upport
for Ap
p
le Mac OS X
'
s
o
pendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore
Ts'o
m
ergetool:
F
i
x ab
o
rt com
m
an
d
when
reso
l
v
i
ng symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodo
r
e Ts'o
mergeto
o
l:
R
emove
spur
i
ous error
message if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
odore Ts'o
merget
o
o
l
:
fac
t
or
o
ut common co
d
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool:
p
ortabilit
y
f
i
x: don't
use reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: portability f
i
x: do
n
'
t assume
t
rue is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
mergeto
o
l: D
o
n't erro
r
out in th
e
merge c
a
se
w
here
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
merget
o
ol: Replace use of "ech
o
-n" with pri
n
tf(1
)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fix minor
formatt
i
ng
i
s
s
u
e in
m
an page fo
r
git-
m
ergeto
o
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
merg
e
tool: pri
n
t an
appropriate warning if merge
.
t
o
ol
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
T
heodore Ts'o
Add git-
m
ergetool to run an
a
ppropriate merge conflic
t
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore
T
s'
o
Ad
d
d
e
finition of <commit-ish> to
t
h
e
main git ma
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodo
r
e
Ts'o
Allow git-remote to update named groups o
f
r
e
mot
e
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts
'
o
A
dd config_boolean() metho
d
to the Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
heodore T
s
'
o
Teach git-remote to update exist
i
ng
r
emo
t
es by fetch
i
n
g
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Allow
a
liases
t
o expand to shell command
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
eodor
e
Ts'o
Pri
n
t a sane error
m
essage if an a
l
ias expands
t
o a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Th
e
o
d
ore Ts'o
Fi
x
format
t
ing for u
r
ls
s
ec
t
ion of fe
t
c
h
, p
u
ll
,
and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree