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 'maint-1.6.2' into maint-1.6.3
2009-05-26
J
u
nio C Ham
a
no
Merg
e
branch '
j
k/maint
-
1
.
6
.
0-tr
a
c
e
-argv' into m
a
int
commit
|
commitdiff
|
tree
2009-05-26
J
uni
o
C Ha
m
ano
Merge branch 'np/pu
s
h-delta' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Ha
m
ano
Merge b
r
anch 'ar/merge-
o
ne-file
-
diag' int
o
main
t
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o
C
Hamano
Merge
b
r
anch 'ar
/
unlink-err' into
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
Ham
a
no
M
e
rge
b
ranch 'jk/
m
ai
n
t-add-em
p
ty' int
o
maint
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix
c
at-fil
e
usage m
e
ssa
g
e and documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
J
eff King
fetch: report ref st
o
rage D
F
errors mo
r
e accu
r
ately
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
lock_ref: inform callers o
f
unavailable
r
ef
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Johannes Sixt
t
3
701: ensure cor
r
ectly
s
et up
r
eposit
o
ry a
f
ter skipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Michael J Gruber
m
e
rg
e
-opt
i
ons
.
txt: C
l
a
r
ify m
e
rge
--squash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_merge to
ge
n
e
r
at
e
o
utput even
for null merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023:
m
erge-file
f
a
il
s
to
output anything
for a deg
e
nerate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Junio
C Hamano
Mer
g
e branch 'maint
-
1
.
6
.
2' int
o
maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C Ham
a
n
o
M
e
r
g
e branch 'maint-
1
.
6
.
1
'
into mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Juni
o
C
H
amano
Merge branch 'maint-1
.
6
.
0' into
ma
i
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Ale
x
Riesen
http-
p
ush
.
c
:
:remove_locks(
)
: f
i
x
use
a
f
ter free
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
R
e
né Scharfe
grep: fi
x
word-rege
x
p
at t
h
e be
g
inning of lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
St
e
phe
n
Boyd
ap
p
ly, fm
t
-merge-msg: us
e
r
elative filenames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
S
t
e
p
hen Boyd
commit
:
-F ov
e
rrides -t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Ren
é
Scharfe
gr
e
p: fi
x
wo
r
d-regexp
c
olouring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Giuseppe
B
ilotta
completi
o
n: use git rev-pars
e
to detect
bare repos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Joha
n
nes
Schindelin
Co
p
e
b
etter with a _lot
_
of packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-20
Jeff King
f
or-each-ref:
f
ix segf
a
ult in copy_email
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Stephen Boy
d
show-bra
n
ch
:
Fix die message
in par
s
e_refl
o
g_param()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
S
tephen Boyd
completion: add missing options
t
o
show-branch and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Linus Torvalds
dir
.
c: clean
u
p handling of
'pat
h
'
parameter in re
a
d_dir
e
cto
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Dan McGe
e
Fix type-p
u
nni
n
g issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Nanako Shiraishi
test: checkout shouldn't say that HEAD has moved if
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C H
a
m
ano
c
ompletion: enhanc
e
"curre
n
t bran
c
h" d
i
splay
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
completion: simplify "current branch" in __git_p
s
1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
unio
C
H
amano
c
o
mpleti
o
n: fix PS1 display
d
uring a
m
e
rge
on detached
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C
H
a
m
an
o
Reve
r
t "git
-
add--interacti
v
e: remo
v
e h
u
nk
c
oalescing"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
M
att Graha
m
S
pl
i
tting a hunk that adds
a line at the top f
a
il
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Da
n
i
el Cordero
bu
i
ltin-checkout:
D
on't te
l
l u
s
er t
h
at HEA
D
has moved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
J
i
m Me
y
ering
pre-commit
.
sample
:
don't print inc
i
d
e
ntal SHA1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
S
t
ephen Boyd
tes
t
s: Add tests for
m
issing f
o
rmat-patch long
o
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Boyd
api-pa
r
se-opt
i
ons
.
txt: use 'fu
n
c
' instead of 'fun
c
t'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Tony
K
emp
Turn on USE_ST_TI
M
ESPEC for Open
B
SD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Junio C Hamano
M
e
rg
e
branch
'
m
aint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-14
Junio
C Ham
a
no
Merge branch
'maint-1
.
6
.
1' int
o
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio C Haman
o
Mer
g
e br
a
n
c
h 'maint-1
.
6
.
0' into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-14
Johann
e
s Schindelin
Add NO_CR
O
SS
_
D
I
RECTORY_HARDLINKS
support to the
Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-13
Junio C Ha
m
ano
G
IT
1
.
6
.
3
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-12
Juni
o
C Haman
o
Merge bran
c
h
'
maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Merge branch 'jc/
m
ain
t
-
r
e
ad-tr
e
e
-multi
'
i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
J
u
nio C Hamano
R
e
ve
r
t "chec
k
o
u
t
branch: prime cache
-
t
ree fully"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Alex
R
ies
e
n
ls-t
r
ee manpage: outpu
t
of
l
s-tr
e
e is
c
omp
a
t
i
ble with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
A
lex Riesen
l
s-tree ma
n
page: use "unless" instead of "when
.
.
.
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Dave Ols
z
ews
k
i
merge-recur
s
ive: never leav
e
inde
x
unmerged w
h
ile r
e
c
ursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Linus
Torv
a
lds
Teach 'git
c
h
eckou
t
' to
p
rel
o
a
d th
e
index contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
L
inus Torvalds
Av
o
id unnecessa
r
y 'ls
t
at()' c
a
lls in 'get
_
stat
_
data()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
J
e
ff
K
ing
a
d
d: d
o
n't comp
l
ain when adding e
m
pty project root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Jim Meyering
format-patch let -k override a
c
onfig-speci
f
i
ed fo
r
m
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
fix GIT
_
TRACE s
e
gfault w
i
t
h
shell-quoted aliases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Alex
a
nder Potashev
Docum
e
ntation: cloning to e
m
p
t
y directory
i
s allow
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
A
lex Ries
e
n
C
l
arify kind of conflict in m
e
rge-one-fi
l
e
hel
p
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Felip
e
C
o
ntrer
a
s
git config:
clarify
-
-add
a
nd --ge
t
-
color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C
H
amano
archi
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
H
a
m
a
no
Start
1
.
6
.
3
.
1
main
t
ena
n
c
e
series
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C Hamano
Mer
g
e branch 'mai
n
t-1
.
6
.
1
'
into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Junio
C
H
a
man
o
Merge branch 'main
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
J
u
n
i
o C Hamano
GI
T
1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-07
Nguyễn Thái Ngọc
D
uy
t4029: use sh instead
of bash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t4200:
c
onver
t
sed
e
xpres
s
ion which ope
r
ates on non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t4200: remove two
u
nnecessary
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t
/annot
a
te-te
s
t
s
.
sh:
avoid passing a non
-
newline t
e
r
minated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Bran
d
on Casey
t41
1
8
: avoid se
d
invocat
i
on on file without te
r
minating
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brando
n
Casey
t
4
1
1
8: add mis
s
ing '&&'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t800
5
: use egre
p
when e
x
tended regular expres
s
ions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
git-clean
doc: the co
m
mand on
l
y
affects paths
u
nder
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
J
u
nio
C
Hamano
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
Merge branch 'rj/
m
aint-1
.
6
.
0-svn-
p
arse-fix'
into maint
commit
|
commitdiff
|
tree
2009-05-06
Juni
o
C Hamano
Merge bra
n
c
h
'm
a
int-1
.
6
.
0' into
maint
commit
|
commitdiff
|
tree
2009-05-06
A
lex Riesen
improve erro
r
messa
g
e
i
n config
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t4018-diff-fu
n
cname: add cpp xfuncn
a
me pattern to syntax
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Bern
d
A
h
le
r
s
Work around BSD whose typeof(tv
.
tv_s
e
c) != time_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephe
n
Boyd
g
i
t-am
.
txt: r
e
word ex
t
r
a
h
e
aders in message body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
S
tephe
n
Boyd
git-am
.
txt
:
Use
date or value instead of t
i
me or timestamp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Ste
p
hen Boyd
git-am
.
txt: add
a
n 'a', sa
y
w
hat
'
i
t' is, simplify
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Bo
y
d
completion: complet
e
values for sen
d
-emai
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Ste
p
hen Boy
d
completion: comp
l
ete values
f
or log
.
d
a
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
completion: complete
values
f
or help
.
form
a
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
St
e
phen Boyd
co
m
pl
e
tion: add {gui,diff,merge}tool
,
man, a
n
d pager
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
completion: add missing
c
o
nfi
g
ur
a
tion v
a
ri
a
bles to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Alla
n
Caf
f
ee
dir
.
c: Fix two
minor gramma
t
ical errors
in
c
omments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Rob
i
n H
.
Johnson
git-
s
vn: fix a sloppy Ge
t
op
t
::Lon
g
usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Sync with GI
T
1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
mano
GIT 1
.
6
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C
Ham
a
no
Merge branch '
n
p/maint-no-ofs-del
t
a
'
into
m
a
int
commit
|
commitdiff
|
tree
2009-05-03
J
un
i
o
C
Haman
o
Merge branch 'm
a
i
n
t
-
1
.
6
.
1
'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
GIT 1
.
6
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C
H
amano
Merge branch 'jc/maint-rea
d
-tree
-
mul
t
i' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ham
a
no
M
erge branch 'mk/maint
-
a
p
ply-
s
wa
p
' into main
t
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
Merge branch 'mm/maint-add-p-quit
'
into main
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
mano
Merge b
r
anch 'lt
/
pack-object-me
m
use'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C
H
amano
Merge b
r
a
nch 'jc/maint-1
.
6
.
0-keep-pac
k
' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch 'jc/maint-1
.
6
.
0-diff-borrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
J
unio C Hamano
M
e
rge branc
h
'bs/main
t
-1
.
6
.
0-tre
e
-walk-pr
e
fix'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
J
unio
C
Hama
n
o
GIT 1
.
6
.
3-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-02
Nicol
a
s Pitre
honor repack
.
used
e
lt
a
b
aseoff
s
et when
f
e
tching packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next