repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'do/maint-merge-recursive-fix' into maint
2009-05-26
J
unio
C
Hamano
M
erge b
r
a
n
ch '
d
o/ma
i
nt-merge-re
c
urs
i
ve-fix' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Haman
o
Merge b
r
a
nch 'jk/maint-1
.
6
.
0
-trace
-
argv' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hamano
Merge branch
'np/pu
s
h
-
de
l
t
a
'
into
maint
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Ham
a
no
Merg
e
b
ranch 'ar/merge-one-file-diag' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
u
n
io C Hamano
Merge bra
n
ch 'ar/unlink-
e
rr' into
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branch 'jk/maint-add-empty' into maint
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix cat-file
u
sage mes
s
age and document
a
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fetch: re
p
ort ref stor
a
g
e DF errors m
o
re accurately
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
l
ock_ref:
i
n
form callers of unava
i
lable re
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Michael J Gr
u
b
e
r
mer
g
e-options
.
txt: Clarify
merg
e
-
-
squash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-24
Ju
n
io C
H
ama
n
o
M
e
rg
e
branch 'maint-1
.
6
.
2
'
into
m
aint
commit
|
commitdiff
|
tree
2009-05-24
J
u
nio
C
Hama
n
o
Mer
g
e
bran
c
h 'maint-
1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
J
u
n
i
o
C
Haman
o
Merge
branc
h
'maint-1
.
6
.
0' into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Alex Riesen
http-push
.
c::remo
v
e_l
o
cks
(
)
: fix use aft
e
r free
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
René Scharfe
grep: fix word-reg
e
x
p colouring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Giuseppe
Bil
o
tta
com
p
let
i
on: use git
r
ev
-
parse to
detect bare r
e
pos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Johannes Schindeli
n
Cope
b
etter with
a
_lot_ of packs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-20
Jef
f
King
for-each
-
ref: fix s
e
gfault in
c
o
p
y_emai
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
S
tephen Boyd
show-branch
:
Fix die m
e
ssa
g
e in parse
_
reflog_param()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Stephe
n
Boyd
comp
l
etion
:
add
m
i
ssing options to sho
w
-
b
ranch and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Lin
u
s
Torvalds
dir
.
c: cle
a
n up
h
andling of 'pa
t
h' p
a
rameter
i
n read_
d
irecto
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
D
an McGee
Fix type-punning issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Na
n
ak
o
Shiraishi
test:
c
h
eckout sho
u
l
dn't say th
a
t
H
EAD
h
as move
d
if
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
complet
i
on: enhance "
c
urren
t
branch"
di
s
play
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C H
a
m
a
no
co
m
pletion
:
simplify "current branch
"
in __g
i
t_ps1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C
Ha
m
a
no
completion: fix PS1 display dur
i
ng a me
r
ge o
n
detached
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Daniel
C
ordero
bu
i
ltin-c
h
eckout: Don
'
t
t
ell user that HEAD has moved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Jim Meyering
pre-commit
.
sample: don't print
i
ncidental SHA1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Boyd
tests:
A
d
d tests for missing format-p
a
tch long options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Boyd
ap
i
-parse-op
t
ion
s
.
txt: use
'fu
n
c' instead of 'funct'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Tony
Kem
p
Turn on U
S
E_ST_T
I
MES
P
E
C
fo
r
Op
e
nBSD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Jun
i
o C Hamano
Merge b
r
an
c
h 'maint-1
.
6
.
2' into m
a
in
t
commit
|
commitdiff
|
tree
2009-05-14
Junio C Hamano
M
e
rge branch 'maint-
1
.
6
.
1
' int
o
main
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio C
Hamano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-13
Jun
i
o C
Hamano
GIT 1
.
6
.
3
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-12
Junio C
H
amano
Merge b
r
anch 'ma
i
nt-1
.
6
.
2' in
t
o maint
commit
|
commitdiff
|
tree
2009-05-12
Juni
o
C
Hamano
Merg
e
branch 'jc/mai
n
t-rea
d
-tree-multi' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Ju
n
io C Hamano
R
e
vert "
c
heckout bra
n
ch: prime ca
c
he-tre
e
fully"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
A
l
ex Rie
s
en
l
s
-
tree m
a
npage
:
o
utpu
t
o
f
ls-tree
is compatible w
i
th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Ale
x
Riesen
ls-tree manpage: us
e
"unless" instead of "w
h
en
.
.
.
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
D
a
ve Olszewski
mer
g
e-recursive:
n
ever le
a
ve in
d
ex
u
nm
e
r
g
e
d
while
r
e
cursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Je
f
f King
add: don't compl
a
i
n
w
hen addi
n
g empty project
root
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
fix G
I
T
_TRACE segfau
l
t with sh
e
ll-quoted a
l
i
ase
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
A
lexander
Potashev
Docum
e
ntation: cloning to
e
mpty
directo
r
y is
a
llowe
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
A
lex Riesen
Clarify
kind of c
o
nflic
t
i
n
merge-on
e
-file helpe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Felipe C
o
ntreras
git
config: clarify --add and --get-color
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C Ham
a
no
arch
i
v
e
-tar
.
c: squelch a
type mismatch war
n
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C Ham
a
n
o
Start 1
.
6
.
3
.
1 maint
e
n
a
nce series
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
Mer
g
e branch '
m
aint
-
1
.
6
.
1
'
into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Juni
o
C Hamano
M
e
rge br
a
nch
'
maint-1
.
6
.
0' int
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Junio C
H
a
mano
GIT
1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-07
Ngu
y
ễ
n
T
hái
N
g
ọ
c
Duy
t4029: us
e
sh instead of b
a
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Bra
n
don C
a
sey
t
4
200
:
convert se
d
e
xpression which opera
t
es
o
n
non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon C
a
sey
t4
2
00: remo
v
e
two unnecessary
l
ines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brand
o
n Ca
s
ey
t/annotate-t
e
sts
.
sh: avo
i
d passing a non-newline termin
a
te
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Br
a
ndon Casey
t411
8
: avo
i
d sed invo
c
ation on f
i
le without terminating
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
B
rand
o
n C
a
s
e
y
t
411
8
: add m
i
ssing
'
&&'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Bran
d
on
Cas
e
y
t8005: use
e
g
rep w
h
en extended r
e
g
ular exp
r
essions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Ha
m
ano
git-clean doc:
t
he comm
a
n
d only affects paths under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Junio C
H
a
m
ano
Me
r
ge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2009-05-06
Junio
C
Ha
m
ano
Merge branc
h
'rj/maint-
1
.
6
.
0-sv
n
-parse-fix' into maint
commit
|
commitdiff
|
tree
2009-05-06
J
u
n
io C Haman
o
Me
r
ge branch 'maint-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-05-06
A
l
ex Riesen
impr
o
v
e
er
r
o
r message in config
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t4018-diff-
f
uncn
a
me: add cp
p
xf
u
ncname
p
atte
r
n to syntax
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
B
e
rnd Ahlers
W
o
rk around BSD
wh
o
se typeo
f
(tv
.
tv_se
c
) !=
t
i
me_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
g
i
t
-am
.
txt: reword ex
t
ra heade
r
s
i
n messag
e
body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
S
t
ep
h
en Boy
d
g
i
t
-
a
m
.
txt: Us
e
date or valu
e
i
n
s
tead of t
i
m
e
o
r timestamp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen
Bo
y
d
git-am
.
txt: add an 'a',
say what 'it' is, sim
p
lify
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
completion: complete val
u
e
s
for send-email
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Bo
y
d
c
o
mpletion: co
m
plete values fo
r
log
.
date
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
St
e
phen Boyd
comp
l
eti
o
n
:
c
o
m
plete values for help
.
f
ormat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
c
o
mpletion:
add {gu
i
,d
i
ff,mer
g
e}t
o
ol, man
,
a
nd pager
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boy
d
com
p
letion:
add m
i
s
s
i
ng con
f
iguration v
a
riable
s
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
All
a
n Caffee
d
i
r
.
c: Fix two m
i
nor grammat
i
c
a
l
e
rror
s
in comments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
R
obin H
.
Johnso
n
g
it-s
v
n: fix
a slopp
y
Getopt
:
:
Long usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio
C
Hamano
Sync with
GIT
1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Haman
o
GI
T
1
.
6
.
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Hamano
Mer
g
e bran
c
h 'np
/
mai
n
t-no-
o
fs-
d
elta' in
t
o maint
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C Hama
n
o
Merge br
a
nch
'
maint-1
.
6
.
1
' into maint
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Hamano
GIT 1
.
6
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C
H
amano
Merge branch 'jc/maint-rea
d
-tree-mu
l
ti' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C
H
am
a
no
Mer
g
e
branch 'mk/maint
-
a
ppl
y
-swap' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch 'm
m
/maint-
a
dd-p-quit' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge b
r
anch '
l
t/pack-
o
bject-memuse' into maint
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Ham
a
no
Merge branch 'jc/m
a
int-1
.
6
.
0-
k
eep-pack' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
J
unio
C
Hamano
Merge b
r
anch 'jc/maint-1
.
6
.
0-dif
f
-borrow-carefull
y
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio
C Hamano
Merge
b
r
a
nch 'bs/mai
n
t-1
.
6
.
0-
t
r
e
e
-
walk-
p
r
e
fi
x
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Ju
n
io
C Hamano
GIT
1
.
6
.
3-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
Nicolas Pit
r
e
honor rep
a
ck
.
usedeltabas
e
offset whe
n
fetchin
g
p
a
c
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
Jun
i
o C Hamano
Merg
e
git://repo
.
or
.
cz
/
git-g
u
i
commit
|
commitdiff
|
tree
2009-05-02
N
i
c
o
l
a
s Pitr
e
allow OFS_DELTA object
s
d
uring
a pu
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-01
René Scharfe
cty
p
e
.
c: fix typo i
n
c
o
mment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-01
Felipe Co
n
treras
Fix a bunch of
pointer de
c
l
arations (codest
y
le
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-01
Junio C
Hamano
M
e
rg
e
git://
g
it
.
ker
n
el
.
org/pub/scm/git
k
/
g
itk
commit
|
commitdiff
|
tree
2009-04-30
Al
e
x
Riesen
Clari
f
y
kind of co
n
fli
c
t in merge-one
-
file he
l
per
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-30
Alex Riesen
imp
r
ove error message in co
n
fi
g
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-30
A
l
ex Riesen
print unlink(2) errno in copy_or_link_di
r
e
c
tory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-30
Alex Riesen
rep
l
a
ce direct calls to unlink
(
2) wit
h
unlink_or_wa
r
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-30
A
lex Riesen
Introd
u
c
e
an
unl
i
n
k(2) wrapper which gives
warning
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ha
m
ano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
next