repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cb/maint-no-double-merge' into maint
2009-06-22
Junio C
Hamano
Merge branch 'cb/maint-n
o
-
dou
b
le
-
merge' in
t
o maint
commit
|
commitdiff
|
tree
2009-06-22
Ju
n
io C Hamano
Mer
g
e br
a
nch 'mn/maint
-
iconv-
a
ut
o
conf' into maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge bran
c
h 'lt/maint
-
unsigned-l
e
ft-shift' i
n
to
maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Me
r
ge branch 'p
b
/maint
-
1
.
6
.
2-
u
serdiff-f
i
x
' into
m
aint
commit
|
commitdiff
|
tree
2009-06-21
Junio C
H
amano
attribu
t
e: whi
t
espace set to
t
rue de
t
ects
all err
o
rs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Nanako Shiraishi
.
gi
t
attributes: CR at the
end
of t
h
e
line is an erro
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Junio C
H
a
m
ano
t35
0
5: fix abus
e
o
f
test_expect_c
o
de
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
M
e
r
ge branch 'm
a
int-
1
.
6
.
2'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2009-06-21
Junio
C
Hamano
M
erg
e
br
a
nch 'main
t
-1
.
6
.
1' into
m
aint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
Junio C Ha
m
ano
Merge branch
'maint-
1
.
6
.
0' in
t
o m
a
in
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-21
Step
h
en
B
oyd
g
it-show-ref
.
txt: remove word and make consis
t
e
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Miklo
s
Vajn
a
git-sv
n
documentation: fix typo in 're
b
ase
v
s
.
pull
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Mark Lo
d
ato
http
.
c: fix
c
ompiling
with libcur
l
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Johannes
Schindel
i
n
import
-
tar
s
: support symlinks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
René S
c
harf
e
upload-archive:
f
ix
i
nfinite l
o
op on
C
y
gwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Paolo Bo
n
zini
avoid exponenti
a
l reg
e
x
m
a
tch f
o
r java an
d
objc
f
u
n
cti
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Li
n
us Torvalds
Fix bi
g
l
eft-shifts
of unsigned
c
har
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-15
Step
h
en B
o
yd
pull, rebase: simplify t
o
use die()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-14
Jim
Meyering
u
se xstrdup, no
t
s
trdup in ll-me
r
ge
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-14
Junio
C Hamano
Merge branch 'ma
i
nt-1
.
6
.
2' int
o
maint
commit
|
commitdiff
|
tree
2009-06-14
Junio C Ham
a
no
Merg
e
b
ranch 'maint-1
.
6
.
1
'
i
nto m
a
int
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Jun
i
o C Hamano
Merge
branch '
m
aint
-
1
.
6
.
0
' into main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-13
Step
h
en Boy
d
git-rer
e
re
.
txt: grammatical fixups and
cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-12
Paolo Bonzini
D
ocument
a
t
i
on: git-se
n
d-m
a
il c
a
n tak
e
rev-list arg
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-11
Junio C Ha
m
ano
M
e
rge branch '
u
k/maint-1
.
5
.
3-rebase-i-reflog' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-11
Uwe Kle
i
ne-König
rebase--inter
a
ctive
:
remote stray cl
o
s
i
ng pare
n
thesis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Johannes Sixt
diff
.
c: plug a memo
r
y le
a
k
i
n a
n
error path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Joh
a
nnes Sixt
fetch-pac
k
: c
l
ose
outpu
t
chann
e
l afte
r
si
d
eband de
m
ultiplexe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Marco Nelis
s
en
fix handling
o
f iconv configura
t
ion options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-08
Mich
a
el J Gru
b
er
bui
l
tin-rem
o
te: Make "r
e
m
o
t
e
show" display a
l
l urls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-06
T
homas Ras
t
Documentation: refer to g
i
tworkflows(7)
fr
o
m tutorial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-06
Shawn O
.
Pearce
d
a
e
mon: Strictly parse the "extra arg" part of the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-04
Jun
i
o C Hamano
GIT 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
René Schar
f
e
grep: fix empt
y
word-
r
egexp matches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Junio
C Ha
m
ano
blame: cor
r
ectly handle a
p
ath that used to be a director
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Thom
a
s Rast
ad
d
-i: do
n
ot dump patch during applic
a
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Junio C Ha
m
ano
Updat
e
draft release notes
f
or
1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merge b
r
an
c
h 'cb/ma
i
n
t
-1
.
6
.
0-xdl
-
m
erge-fix'
i
nto maint
commit
|
commitdiff
|
tree
2009-06-02
J
unio C Hamano
Merge bra
n
ch 'rs/maint-g
r
e
p
-w
o
rd-r
e
g
e
xp-fix' into maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Me
r
ge
b
ranch 's
b
/
m
aint-1
.
6
.
2-opt-fil
e
na
m
e
-
fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Junio C
H
am
a
no
Merg
e
branch
'
jc/maint-ad
d
-
p
-
coalesce-fix' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2009-06-02
Junio C Ham
a
no
M
erge
b
ranch '
t
r/ma
i
nt-doc-stash-pop' into mai
n
t
commit
|
commitdiff
|
tree
2009-06-02
René
S
charf
e
grep: fix
c
o
louri
n
g of m
a
tches with zero len
g
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Clemen
s
Buchacher
refuse
to m
e
r
g
e durin
g
a merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
Thomas Rast
Documentat
i
on: teach stash/pop wor
k
flow inste
a
d
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-28
Clemens Buchach
e
r
fix segfau
l
t showing an empty rem
o
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio
C Hamano
Prepar
e
for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
J
unio C Hamano
M
e
rge bra
n
ch 'js/maint-no-ln-across
-
libexec-and-bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C H
a
mano
Merge branch 'l
t
/main
t
-diff-reduc
e
-lstat'
into m
a
int
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
Merge branc
h
'jm/for
m
at-patc
h
-no
-
au
t
o-n-when-k-is-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Haman
o
Me
r
g
e
branc
h
'do/
m
aint-merge-recursive-fix' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
M
er
g
e bra
n
ch 'jk/maint-1
.
6
.
0-trac
e
-argv
'
into
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C Hamano
Merge
branch '
n
p/push-delta' into
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Hamano
Merg
e
branc
h
'ar
/
merge-one-file-
d
iag' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
Merge branch 'a
r
/unlin
k
-er
r
'
into m
a
int
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branch
'jk/maint-
a
dd-em
p
t
y
'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-25
Jeff Ki
n
g
f
i
x cat-file
usage message and docume
n
tation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fe
t
ch: report ref storage DF erro
r
s
m
ore accurately
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff K
i
ng
lock_ref: inform callers of u
n
available re
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Johannes
S
i
xt
t3701: ensure correctly s
e
t up r
e
pository afte
r
skipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Mi
c
hael J Gruber
m
e
rge-options
.
txt: Clarif
y
m
e
rge --squash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bai
l
ey
Change xdl_
m
erge to generate out
p
ut even
f
or null m
e
rges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
l
es Bailey
t6023: merge
-
file fails to outp
u
t anything for a dege
n
er
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge branch
'mai
n
t-
1
.
6
.
2
'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Me
r
ge
b
r
anch 'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio
C H
a
man
o
Merg
e
branch 'maint
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Al
e
x Riesen
http
-
push
.
c
::remov
e
_locks(): fix use after f
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Ren
é
Scharfe
g
re
p
:
fix
w
o
rd-regexp
a
t
the beg
i
n
ning of lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Stephen Boyd
apply, fmt-merge-msg: use rel
a
tive filenames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Stephen Boyd
commit: -F overrides -t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
René Scharfe
g
r
ep: fi
x
w
o
r
d
-regexp colouring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Giuseppe Bilott
a
comple
t
ion: use
g
it rev-parse
to detect bare r
e
pos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Joh
a
nnes S
c
hind
e
lin
Cope better with a _lo
t
_ of pac
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-20
Je
f
f King
for-
e
ach-ref: fix segfault in copy
_
email
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
St
e
phen Boy
d
s
h
o
w
-
branch: Fix d
i
e messa
g
e in pa
r
se_reflog_param()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
S
t
ephen Boyd
c
o
mpl
e
t
i
on: add mis
s
ing
o
ptio
n
s to show-
b
ranch and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Linus Torvalds
dir
.
c: c
l
ean up handling of 'path'
parameter in read_directo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Dan McGee
Fix type
-
pun
n
ing
issue
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Nanako Shiraishi
test:
c
heckout s
h
ould
n
't say that HEAD has m
o
ved if
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C
H
a
ma
n
o
completion:
e
nhance "curren
t
b
r
anch" disp
l
ay
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
completion: simplify "current bran
c
h" in __git
_
ps1(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C
Hamano
c
o
mp
l
etion:
f
ix PS1 displa
y
during
a merg
e
o
n
de
t
a
c
hed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
un
i
o C Hama
n
o
Revert "git-add--in
t
e
r
active: remo
v
e
h
unk coale
s
cing"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
M
a
tt Grah
a
m
Splitting a hunk
t
hat adds a line at the
t
op fa
i
ls
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Daniel Cord
e
ro
builtin-c
h
eckout: Do
n
't tell user that H
E
AD has move
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
J
im
M
eyeri
n
g
pre
-
com
m
it
.
sample:
d
on't
p
rint incid
e
ntal SH
A
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
St
e
ph
e
n Boyd
tests: Add te
s
ts for
m
issing
for
m
at-patch long
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Boyd
api
-
parse-optio
n
s
.
txt: u
s
e
'func' instead of 'funct'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Ton
y
Kemp
T
urn on
US
E
_ST
_
TIMESPEC for
O
p
e
n
BSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
J
unio C Hamano
Merge bra
n
ch
'
maint-1
.
6
.
2' int
o
maint
commit
|
commitdiff
|
tree
2009-05-14
Ju
n
io
C
Hamano
Merge br
a
nch 'mai
n
t-1
.
6
.
1' i
n
to mai
n
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Jun
i
o C Hamano
Merge bra
n
ch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-14
J
o
hanne
s
Schind
e
lin
Add NO_CROSS_DIRECTORY_HA
R
DLINKS support t
o
t
h
e
M
akefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-13
Junio C
H
a
m
a
n
o
GIT 1
.
6
.
3
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-12
J
unio C Hamano
M
erge bra
n
c
h
'maint-1
.
6
.
2'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-05-12
Junio
C
H
a
man
o
Merge
b
ranch '
j
c
/
maint-read-tree-multi'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hama
n
o
Revert "c
h
eckout branch: prim
e
cache
-
tree fully"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Alex Ri
e
sen
ls-tree manpage: output of ls
-
tree is comp
a
tible w
i
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Alex Riesen
ls-tree manpage: u
s
e
"unless" in
s
tead of "when
.
.
.
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Dave Ols
z
ewski
merge-
r
ecursive:
n
ever leave ind
e
x
u
n
me
r
ged
while recursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next