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 'maint'
2010-08-24
Juni
o
C Hamano
M
erge
b
ranch
'main
t
'
commit
|
commitdiff
|
tree
2010-08-24
J
on
a
than
N
ieder
par
s
e-
o
ptio
n
s: clarify PA
R
S
E
_
OPT_
N
OARG de
s
cription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan Nieder
t3302 (notes):
Port
to
S
olaris
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Brian Gernhardt
t76
1
0: cd insi
d
e subshe
l
l instead of aro
u
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
Junio C Hamano
Merge br
a
n
c
h
'
maint
'
commit
|
commitdiff
|
tree
2010-08-22
R
a
l
f
W
i
l
de
n
hues
Typos in
code com
m
ent
s
, an
e
rror message,
docu
m
e
n
tation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
R
alf Wil
d
enhues
Typ
o
s in code commen
t
s
,
an error m
e
s
sage, documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Juni
o
C
H
amano
Merge branch 'mm/re
b
a
s
e-i-e
x
ec'
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
i
o C
H
a
man
o
Merge branch 'gb/split-cmdl
i
ne-
e
rrm
s
g'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge bra
n
ch '
s
o/h
t
tp-user-agent'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ham
a
no
Merge branch 'mm/
s
h
ortopt-de
t
ached'
commit
|
commitdiff
|
tree
2010-08-22
Junio C
H
ama
n
o
Merge bran
c
h 'sr/loc
a
l
-
config'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Mer
g
e b
r
anch 'n
d
/f
i
x
-
sparse-checkout'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
Hamano
M
e
rge branch 'hv/su
b
mo
d
ule-find-
f
f-merge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ha
m
ano
Mer
g
e branch 'en/rebas
e
-agai
n
st-rebase
-
f
i
x'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio C H
a
m
a
no
Merge
b
ranch
'dg
/
local-mod-error-messages'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio
C Hama
n
o
Merge branch 'po/userdiff-csharp'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
M
e
rge br
a
nch 'ab/per
l
-install'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-08-22
J
ens Lehmann
t7403: add mi
s
sing &&'s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mark Rada
T
e
ll
ignore f
i
l
e
about ge
n
era
t
e files in
/gitweb/static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
amano
Merg
e
b
ra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio
C
Hamano
Me
r
ge bra
n
ch 'jc/m
a
int-
f
oll
o
w-ren
a
me-fix
'
i
nto main
t
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio
C Hamano
Merge branch 'jn/
m
a
int-plu
g
-leak'
i
nto m
a
int
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
M
e
rge bra
n
ch 'jn/
f
ix-
a
bbrev' into
maint
commit
|
commitdiff
|
tree
2010-08-20
Junio
C H
a
mano
Merg
e
branch 'vs/doc-spe
l
l
' into main
t
commit
|
commitdiff
|
tree
2010-08-20
Juni
o
C
Hamano
Merge branch '
j
n
/
r
e
base-rename-am' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
unio C
H
amano
Merge branch
'
jn/doc-pull'
i
nto
m
a
i
nt
commit
|
commitdiff
|
tree
2010-08-20
Junio
C Hama
n
o
Merge bran
c
h 'bc/use-mo
r
e-har
d
l
inks-
i
n-instal
l
' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branc
h
'
tr/rfc-reset
-
doc'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar
Ramach
a
n
d
ra
buil
t
in/checkout: Fix message w
h
e
n
s
witching to
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu Mo
y
xmalloc: include s
i
ze in the failure message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Haman
o
Merge b
r
a
nch 'maint' to sync w
i
t
h
1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio
C
Hamano
G
it 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio
C
H
amano
Merge branch 't
r
/xsize-b
i
ts' into main
t
commit
|
commitdiff
|
tree
2010-08-19
J
unio C Hamano
Merge br
a
nch 'jc/sha1-name-find-fix' i
n
to m
a
i
nt
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 's
p
/
fix-smart-http-deadlock-on
-
erro
r
'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o
C
Hamano
Merge branch 'jc/maint-follow-rename-fix'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
Merge branch 'tf/str
i
ng-list-init'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C Hamano
Merg
e
bra
n
ch 'cc/find-com
m
it-su
b
j
e
ct'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
H
a
mano
Merge branch 'jn/maint-plug-l
e
ak'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Hamano
Merge bra
n
c
h
'jl/submodule-
i
gnore-di
f
f
'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio
C
Hamano
Me
r
g
e branch 'm
l
/
rebase-
x
-strate
g
y'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Hamano
Merge bran
c
h 'jn/fix-ab
b
rev'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merg
e
br
a
nch 'vs/doc-sp
e
ll'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C
H
amano
Merge branch 'jh/use
-
test-must
-
fail'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
M
e
rge b
r
anch 'jh/clean-exclude'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge
branch '
k
f/post-r
e
c
ei
v
e-
s
ample-hook'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
i
o
C
Hamano
Merge branch 'ab/
r
eport-
c
orrupt-o
b
ject-wit
h
-typ
e
'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Haman
o
Me
r
g
e
branch 'jn/rebas
e
-rename-am
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
amano
Merge b
r
anch '
j
n/fast-import-subtree'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
M
e
rg
e
b
ranch 'ar/s
t
r
i
ng-list-foreach'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
io
C
Hamano
Mer
g
e
bran
c
h 'jh/graph-n
e
xt-
l
ine'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
a
no
Me
r
ge branch 'tr/xsize-
b
its'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C Hamano
Merge branch
'
tc/checkout-B'
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: S
k
ip aut
o
resolved paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Petr Onder
k
a
Userdiff patter
n
s
for C#
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Ævar Arnfjörð
B
jarmason
log:
test fo
r
regression int
r
oduce
d
in v1
.
7
.
2-rc0~1
0
3^2~2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Bran
d
on Casey
git-reba
s
e
-
-i
n
teract
i
ve
.
sh
:
u
s
e printf instead of echo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Bra
n
d
o
n Casey
git-rebase--int
e
ractive
.
s
h: rework skip_unnecessary_picks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
J
u
ni
o
C Hamano
diff --fol
l
ow: do call diffcore_std() a
s
nec
e
ssary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
d
iff
--follow: do n
o
t waste cycles while recursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Ævar
Arnfjörð Bj
a
r
m
a
son
pe
r
l/Makef
i
le: U
n
set INSTALL_BASE when
m
aking perl
.
m
ak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elij
a
h Newren
pull --rebase: Av
o
id spuriou
s
conflicts a
n
d
re
a
pplying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newr
e
n
t55
2
0-pul
l
: Add testcases s
h
o
w
i
n
g spurious
c
onfli
c
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ha
m
ano
Merge bran
c
h 'jc/sha1-name-find-fix'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
i
o
C Hamano
Merge branch '
j
n/doc-pull'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch
'
j
n
/maint-gitweb-dynconf'
commit
|
commitdiff
|
tree
2010-08-13
Junio C
H
ama
n
o
Merge branch 'bc/use-mo
r
e-hardlinks-i
n
-install'
commit
|
commitdiff
|
tree
2010-08-13
Junio
C
Haman
o
Merg
e
branch 'tr/rfc-reset-doc'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
io C Hamano
M
e
rge branc
h
'jn/
p
arse-
d
at
e
-basic'
commit
|
commitdiff
|
tree
2010-08-13
Junio C H
a
mano
M
erge branch 'sp/fix-
s
m
art
-
htt
p
-deadlock-on-e
r
r
or'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-08-13
M
a
tthieu M
o
y
push:
m
ention
"git pull" in error
m
e
s
s
age fo
r
non-fast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
J
o
nathan Ni
e
der
Sta
n
dardize do {
.
.
.
}
w
hile (0) style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Brand
o
n
C
a
s
ey
t/t7003: rep
l
ace
\
t w
i
th literal tab in s
e
d expression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Nelson Elhage
index-pack:
D
on't fol
l
ow replace
refs
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Spencer E
.
Olson
Allow HTTP user agent st
r
i
ng to be
m
o
dified
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
J
unio C Hamano
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-08-11
M
a
tt
h
ieu Moy
post-receive-email: remove spurious
co
m
mas in email
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Raja
R Harinath
f
ast-import: e
x
port corr
e
ctly marks
l
arger than 2
^
20-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Ævar
Arnfjör
ð
Bjarmason
t/lib-git-svn
.
sh:
us
e
$PERL_PATH for per
l
, not
p
erl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Diane Gasseli
n
t7609: test
merge a
n
d
c
h
eckout error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Ma
t
th
i
eu M
o
y
un
p
ack_tre
e
s: g
r
oup erro
r
messages by type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Mat
t
hi
e
u Moy
merge
-
recursive:
d
i
stinguish "re
m
o
v
e
d
" and "
o
verwrit
t
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Diane Gas
s
e
l
in
m
e
rg
e
-recursive:
por
c
e
l
ain messages for checkou
t
8ccba008 (
Junio C Hamano
, Sat May 17 21:03:49 2008, unpack...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu
M
oy
Tu
r
n unpa
c
k_trees_o
p
tions
.
ms
g
s into a
n
array + en
u
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
test
-
li
b
: user-fr
i
endly alt
e
rna
t
ives
t
o
test [-d|-f|-e
]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu
Mo
y
rebase -i: add exec command to laun
c
h a she
l
l
comman
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nie
d
e
r
write-tree
:
Av
o
id l
e
ak
w
hen
i
nd
e
x refers to an inv
a
lid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
read-tree: s
t
op
l
eaking tree objec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan N
i
ede
r
core: Stop le
a
king ondi
s
k_cache_entrys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jakub
N
arebsk
i
diff:
st
r
ip
extra "/" when
s
t
r
ipping pref
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Greg B
r
ockman
split_cmd
l
ine
:
Allow caller to acce
s
s
error string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jun
i
o C Hamano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2010-08-09
Jonathan
N
i
e
de
r
gitweb: clarify sear
c
h r
e
sults page wh
e
n no matchin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Tay Ray Chuan
builtin/checkout: ha
n
dle -
B
from detached HEAD
c
orrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jona
t
ha
n
Nieder
D
ocumentation
:
add a FILES section for show-
r
ef
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Nguyễn Thái Ng
ọ
c
D
uy
unpack-tr
e
es: mark new ent
r
ies sk
i
p-work
t
ree appropriately
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
N
guyễn
Thái
N
g
ọc Duy
unpack-trees: d
o
no
t
check
f
or conflict
e
ntries too
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next