repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ar/merge-one-file-diag' into maint
2009-05-26
Junio C Hama
n
o
Merge b
r
an
c
h 'ar/m
e
rge-
o
n
e-
f
ile-diag' into main
t
commit
|
commitdiff
|
tree
2009-05-26
J
unio C Hamano
M
e
rge bran
c
h
'ar/unl
i
n
k-err' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C Hama
n
o
Me
r
ge
b
ran
c
h
'jk/maint-add-e
m
pty' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
f
i
x
cat-file
u
s
a
ge message an
d
documentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Je
f
f King
fetch: report ref storage DF er
r
o
r
s more accura
t
ely
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
J
e
f
f
K
ing
lock_ref
:
inform callers of unavailabl
e
ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Michael J Gr
u
b
er
merge-options
.
txt: Cl
a
rify merge --squash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merg
e
b
ranch 'maint-1
.
6
.
2' in
t
o maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hama
n
o
Merg
e
b
r
anch
'
maint-1
.
6
.
1
'
into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio
C
Hamano
Merge b
r
anch '
m
aint-1
.
6
.
0
'
i
nto maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Alex Ri
e
sen
http-push
.
c::re
m
ove_locks(): fi
x
use after free
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
René Scharfe
g
r
ep:
fix wo
r
d-
r
egexp colourin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
G
iuseppe Bilotta
completion: u
s
e git rev-parse to detect bare repos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Johannes Schindelin
Cope better with
a _lot_ of packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-20
Jeff King
for-each-ref: fix segf
a
ult in cop
y
_email
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Stephen Boyd
show-branch: Fix
d
ie message
in
p
arse
_
reflog_param()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
S
t
ephen Boyd
completion: add
m
i
ssi
n
g options t
o
show-bra
n
c
h
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Linus
Torvalds
dir
.
c
:
c
lean
up h
a
ndling
of
'path' parameter in read_d
i
recto
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Da
n
McGee
F
i
x
t
ype
-
punning i
s
sues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Nanak
o
Shiraishi
t
e
st: checkout
s
houldn't
say that
H
E
A
D has mov
e
d if
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
co
m
pletion: enhance "current branc
h
"
d
i
sp
l
ay
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
completion: simplify "current b
r
anch" in __git_ps1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Juni
o
C Hamano
completion: fix PS1 d
i
splay during a
merg
e
on det
a
ched
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Daniel Cord
e
ro
builtin
-
checkout: Don't tell use
r
that HEAD has moved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
J
im Meyerin
g
pre-co
m
mit
.
samp
l
e
:
don'
t
pri
n
t in
c
idental SHA1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Boyd
tests: A
d
d tests
f
or mi
s
s
ing format-pa
t
ch long options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Boyd
api-parse-opt
i
ons
.
txt: us
e
'
f
unc' inst
e
ad
of 'f
u
nc
t
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Tony
Kemp
T
u
rn o
n
U
SE_ST_TIM
E
SPEC for OpenBS
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Ju
n
io C Ha
m
ano
Merge bran
c
h 'maint-1
.
6
.
2' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-05-14
Junio
C Ham
a
n
o
Merge branch
'main
t
-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Jun
i
o C Hamano
Merge branch 'maint-
1
.
6
.
0' int
o
mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-13
Junio C Hamano
GIT 1
.
6
.
3
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Merge br
a
n
c
h
'main
t
-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-12
Jun
i
o C Hamano
Merge
br
a
n
ch 'jc/maint-
r
e
ad-t
r
ee
-
m
ult
i
' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Re
v
ert "checkout bra
n
ch: prime c
a
che-tree fully"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Alex
R
i
esen
l
s
-tree manpage
:
output of ls-tr
e
e i
s
c
o
mpatible w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Al
e
x
Riesen
ls
-
t
r
e
e
manpage: use "unless" i
n
st
e
ad of "wh
e
n
.
.
.
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
K
ing
a
d
d:
do
n
't comp
l
ain whe
n
addi
n
g empty project root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Alexand
e
r Potashev
Documentatio
n
: c
l
o
ning
to e
m
p
ty directory
i
s allowed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Alex Rie
s
en
Clari
f
y kind o
f
c
onflict i
n
me
r
g
e
-one-
f
ile helpe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
F
elipe Contr
e
ras
git c
o
nfig: clarify --add and --get-color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
J
u
nio
C Hamano
archive-tar
.
c: squel
c
h a
type mi
s
match warnin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C
H
amano
Start 1
.
6
.
3
.
1
m
ai
n
ten
a
nce
s
eri
e
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Ha
m
ano
Merge branch 'mai
n
t-1
.
6
.
1' int
o
maint-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Jun
i
o C Hama
n
o
Merge branch 'ma
i
nt-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Junio C Hamano
GIT 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-07
Nguyễn Th
á
i
N
gọc Duy
t
4029: use sh instead of bash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t420
0
: conv
e
rt sed expression which
operates on non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon
C
asey
t4200: remove
t
wo unne
c
essary lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Bran
d
o
n
Cas
e
y
t/annotate-
t
ests
.
sh: avoi
d
pa
s
sing a non-newli
n
e terminated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brando
n
Casey
t411
8
:
av
o
id sed invocation on
f
ile
wit
h
ou
t
termin
a
ting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Ca
s
ey
t4118: a
d
d missing
'
&&'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Case
y
t8
0
0
5
: u
s
e egrep when exte
n
ded reg
u
lar e
x
pressio
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
git-c
l
ea
n
doc: the command onl
y
a
f
f
e
cts paths und
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Haman
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-05-06
Junio C H
a
mano
Merge b
r
anch 'r
j
/maint
-
1
.
6
.
0-svn-parse
-
fi
x
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-05-06
Ju
n
io
C
Ha
m
ano
Merge branch 'maint-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-05-06
Alex
Riesen
impr
o
ve erro
r
mes
s
age in config
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
B
r
an
d
on C
a
sey
t401
8
-di
f
f-funcname:
a
dd cpp xf
u
ncname
pattern to syntax
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Bernd
A
hlers
Work around BSD whose
typeo
f
(tv
.
tv_sec) != time_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen
Boyd
git-am
.
txt:
re
w
ord extra
h
eaders in message
b
o
dy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Step
h
en
Boyd
g
it-am
.
txt: Use date or value instead of time or timestamp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
St
e
phen Boyd
git-am
.
tx
t
: add an '
a
', say what 'it' is, simplify
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
completion: co
m
ple
t
e
v
alues fo
r
send-email
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Steph
e
n Boy
d
completion: comp
l
ete values fo
r
l
o
g
.
d
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
comple
t
ion: comp
l
ete
values
f
o
r help
.
format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Step
h
en Boy
d
co
m
ple
t
ion: add {gui,diff,merge
}
tool, man,
an
d
pager
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Step
h
en Boyd
completio
n
: ad
d
missi
n
g co
n
figuratio
n
var
i
ab
l
es
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Allan Caffee
dir
.
c:
F
ix two mi
n
or
gr
a
m
matic
a
l er
r
o
r
s
in co
m
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Rob
i
n H
.
Johnson
g
it-svn: fix a sloppy Getopt::Long usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
H
a
mano
Syn
c
with GIT 1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
J
unio C
H
a
man
o
GIT
1
.
6
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Haman
o
Merge branch 'np/maint-n
o
-o
f
s
-delta' into main
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Haman
o
Merge b
r
anch 'maint-1
.
6
.
1'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C Hamano
G
I
T 1
.
6
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
ma
n
o
Merge branch
'jc/m
a
i
nt
-
read-tre
e
-
m
ulti' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
H
amano
Merge b
r
anch 'mk/m
a
in
t
-
a
pply-swap' into main
t
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Hamano
Merg
e
branch 'm
m
/maint-add-p-quit' into
m
ain
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Hamano
Merge
b
ran
c
h
'
l
t/pack-object-mem
u
se' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Mer
g
e
b
ranch
'jc/maint-1
.
6
.
0-keep-pa
c
k' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Hamano
M
erge branch 'jc/m
a
int
-
1
.
6
.
0-diff-borrow-
c
arefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C
H
ama
n
o
Merge br
a
nch
'b
s
/maint
-
1
.
6
.
0-tree-wa
l
k
-
prefix' into
.
.
.
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
N
ico
l
as
P
itre
honor repack
.
usedeltabaseoffset
when fetching p
a
c
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-02
Juni
o
C H
a
m
ano
Merge git://r
e
po
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-05-01
Re
n
é
Scharfe
ctype
.
c
:
fix typo
in
c
omment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-01
Feli
p
e Contreras
Fix a bunch o
f
pointer dec
l
ara
t
i
o
ns
(
c
od
e
s
t
yle)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-01
Jun
i
o C Ha
m
a
n
o
M
e
r
g
e git://git
.
kernel
.
org/pub/scm/git
k
/
g
itk
commit
|
commitdiff
|
tree
2009-04-30
Alex Ri
e
s
e
n
Clar
i
fy kind
of co
n
flict in merge-one-
f
ile
h
e
l
p
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-30
Alex Riesen
improve error message i
n
c
o
nfi
g
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-30
Alex Riese
n
p
r
int unlin
k
(2) errno
in cop
y
_or_l
i
nk_
d
irec
t
ory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-30
Al
e
x
Riesen
replace
direct calls to unlink(2) with unli
n
k_or_warn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-30
Al
e
x R
i
ese
n
Introduce an unlink(2) wrapper whi
c
h
gi
v
es
w
ar
n
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio
C
Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-04-29
Ben
j
amin K
r
amer
d
aemo
n
.
c: fix se
g
faul
t
on OS X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ha
m
an
o
merge-recursiv
e
: do not die on a conflictin
g
su
b
module
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Feli
p
e
C
o
n
treras
git c
o
n
f
ig: er
r
or wh
e
n edit
i
ng a repo config and not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
U
we
Kleine-K
ö
nig
parseopt: fix documentati
o
n fo
r
-
-
keep-d
a
shdash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Jo
h
annes Schin
d
e
l
i
n
R
e
n
a
m
e core
.
u
n
re
l
i
ableHard
l
inks to core
.
c
r
eateO
b
je
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
Merg
e
br
a
nch '
m
aint-1
.
6
.
1'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
next