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 'hv/submodule-find-ff-merge'
2010-08-22
Junio C Hama
n
o
Merge branch 'hv/submod
u
le-find-
f
f-merge'
commit
|
commitdiff
|
tree
2010-08-22
Juni
o
C
Hamano
Merge bra
n
ch 'en/r
e
base
-
against-rebase-f
i
x'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge br
a
nc
h
'dg/local-
m
od-error-message
s
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
M
erge
b
ra
n
c
h
'
po/userd
i
f
f
-csha
r
p'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merg
e
bran
c
h 'ab/perl-install'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-08-22
Jens Le
h
mann
t
7
403: add m
i
ssing &&'s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Mark Rada
T
ell ignore file
about gener
a
te
f
iles in
/
gitweb/static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
am
a
no
Merge branch 'jc/mai
n
t-fo
l
low-rename
-
fix'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2010-08-20
Junio
C Hamano
Me
r
ge branch 'jn/mai
n
t-plug-leak' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
M
erge branc
h
'jn
/
fix-ab
b
rev'
i
n
t
o maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Haman
o
Merge branch 'vs/doc-s
p
ell
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o
C Hamano
Merge bra
n
ch 'jn
/
rebase-rename-am' into maint
commit
|
commitdiff
|
tree
2010-08-20
Ju
n
i
o
C Hamano
Mer
g
e
b
ranch 'jn/
d
oc-pull' into
m
a
int
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ham
a
n
o
Merge branch
'bc/use-more-ha
r
dlinks-in-install' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C
H
a
mano
Merge branc
h
'tr/rfc-reset-doc' i
n
to main
t
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar
R
a
machand
r
a
builtin/check
o
u
t
: Fix
m
es
s
age when switchi
n
g to a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Matthie
u
Moy
xmal
l
oc: include size in th
e
failure message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Merge branch 'maint' to sync with 1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C
Hamano
Git 1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Merge
b
ranch
'
tr/xsize-bits'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-19
Junio C Ham
a
no
Merge branch '
j
c/sha1-
n
ame-find-f
i
x' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
io C
H
a
ma
n
o
Merge
b
r
anch 's
p
/fix-s
m
a
r
t-http-
d
ea
d
lock
-
on
-
error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge bra
n
ch 'jc/maint-follow-rename-fi
x
'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
Merge branch 'tf/string-list-init'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
Merge branch 'cc/find-com
m
it-
s
u
bject'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
a
mano
Merge bra
n
c
h
'jn/maint-plug-
l
eak'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C Hama
n
o
Merge
b
ranch 'jl/subm
o
dule
-
ignore-diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
a
m
a
n
o
Merge branch
'ml/
r
ebase-x-st
r
ategy'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
am
a
no
M
erge branch 'jn/fix-abbre
v
'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Hama
n
o
Merge branch 'vs/do
c
-spell'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
amano
Me
r
ge branch 'jh/u
s
e
-
test-must-fai
l
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge bra
n
ch 'jh
/
clea
n
-exclude'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
io C Hama
n
o
Merge branch 'kf/post-receive-
s
ampl
e
-hook'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Me
r
ge
b
ranch 'ab/report-corr
u
pt-object-with-type'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jn/rebase-re
n
ame-am'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hama
n
o
Mer
g
e branch
'
jn/fast-import-subtree'
commit
|
commitdiff
|
tree
2010-08-18
J
unio
C Hamano
Merge branch 'ar/string-list-foreach'
commit
|
commitdiff
|
tree
2010-08-18
Junio C H
a
mano
Merge branch 'jh/
g
r
a
ph-n
e
xt-li
n
e'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
ano
M
erge branch 'tr/x
s
ize-bits'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
M
erge branch 't
c
/chec
k
o
ut-B'
commit
|
commitdiff
|
tree
2010-08-17
David Agu
i
lar
mergetool: Skip a
u
toresolved paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-17
Petr O
n
d
e
r
ka
Userdiff p
a
t
t
erns for C#
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Ævar
A
rnfjörð Bjarmason
log: test fo
r
regression i
n
troduced
in v1
.
7
.
2-rc0~
1
03^2~2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
diff -
-
follow:
d
o call diffcore_std()
a
s
n
ec
e
ssary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C
H
a
m
a
n
o
diff --follow: do not waste cycles
w
hile recursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Ævar Arn
f
jö
r
ð
Bjar
m
as
o
n
perl/Makefile: U
n
set I
N
STALL_BA
S
E wh
e
n
m
ak
i
ng perl
.
mak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Eli
j
ah Newren
pull --rebase: Av
o
id spu
r
ious conflicts
a
nd rea
p
plying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t5520
-
p
u
l
l: Ad
d
testcases show
i
ng sp
u
ri
o
u
s
conflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hama
n
o
Merge branch 'jc/s
h
a1-name-f
i
nd-fix'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch
'jn/d
o
c-pul
l
'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ha
m
ano
Merge branch
'jn/main
t
-gitweb-dy
n
co
n
f'
commit
|
commitdiff
|
tree
2010-08-13
J
unio C Hama
n
o
Merge b
r
anch
'
bc/
u
se-m
o
re-hardli
n
ks-in-instal
l
'
commit
|
commitdiff
|
tree
2010-08-13
Junio C H
a
man
o
Mer
g
e branch '
t
r/rfc-reset-doc'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ha
m
a
n
o
Merge
branch 'jn/parse-d
a
t
e
-b
a
sic'
commit
|
commitdiff
|
tree
2010-08-13
Jun
i
o C Hamano
Merge branch 's
p
/fi
x
-smart
-
http-dea
d
lock-on-erro
r
'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Haman
o
M
erg
e
br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2010-08-13
M
a
tt
h
ie
u
Moy
pus
h
: mention "git pull" in erro
r
messa
g
e for non-fast
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Jona
t
han Nieder
Stand
a
rdize do {
.
.
.
}
while
(
0)
s
tyle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Brandon Casey
t/t
7
0
0
3: rep
l
ace \
t
wi
t
h
l
iteral
tab in sed expr
e
ssion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Nelso
n
Elhage
index-pack
:
Don't follow replace refs
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Junio C Hamano
M
erge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
p
o
s
t-r
e
ceive-email: r
e
move sp
u
rious commas in email
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Raja
R
H
a
r
i
n
ath
fast-import
:
export cor
r
ec
t
ly
m
a
rks larger than 2^20-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Ævar Arnf
j
örð Bjarmason
t
/lib-git-svn
.
sh: use $P
E
RL
_
PATH for perl, not perl
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Dia
n
e Gasseli
n
t7609: test merge and c
h
ecko
u
t error
m
ess
a
ges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Matt
h
ieu Moy
unpa
c
k_trees: group
e
rror mess
a
ges by type
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu
M
oy
mer
g
e-recursive: disti
n
guis
h
"
removed" and "ove
r
writ
t
e
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Diane Gasselin
mer
g
e
-
recur
s
i
v
e:
p
orcel
a
in messa
g
es fo
r
checkou
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
Turn unpack_trees_options
.
msgs in
t
o a
n
arra
y
+ enum
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jona
t
han Ni
e
de
r
w
r
ite-t
r
ee: Avoid leak w
h
en index refer
s
to
a
n
i
n
valid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
read-tree: stop lea
k
ing tree ob
j
ec
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
cor
e
: Stop
l
e
a
king o
n
d
i
sk_cache
_
en
t
rys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jakub Narebski
diff:
strip extr
a
"
/
" when stripping
prefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Junio
C
Hamano
M
erge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-08-09
J
onatha
n
Niede
r
gitweb: clarify sea
r
ch re
s
ults pag
e
when no m
a
tching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Tay Ray Chuan
buil
t
i
n
/checkout: handle -
B
f
r
o
m
detached
H
EAD correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
J
o
na
t
han N
i
eder
Docume
n
tation: add
a
FILES
s
ection fo
r
sh
o
w-r
e
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
J
onathan Nied
e
r
Makefile
:
add missing dep
e
ndenc
y
on
http
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan
Nieder
Mak
e
file: add missing dependencies on
u
rl
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Michae
l
J
Gruber
Do
c
umentation/git-log: Clar
i
fy --full-di
f
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Willy Tarreau
gi
t
-rebase: fix t
y
p
o
when parsi
n
g --force-rebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Ævar Arnfjörð
Bjarm
a
s
o
n
imap-
s
en
d
:
F
ix sprintf usa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
prune: allow --dr
y
-run for -n a
n
d
-
-ve
r
bose for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
notes: allow
--d
r
y
-
run for -n and --verbose for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Junio C Ham
a
no
Merge branch 'webrick' of git://gi
t
.
bogom
i
p
s
.
org/git-svn
commit
|
commitdiff
|
tree
2010-08-09
Matth
i
eu Moy
Document -B<n>[/
<
m>], -M<n> and -C<n> v
a
riants of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Br
a
d King
Docum
e
nt
a
tion: cite
g
it-am from git-appl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Thomas R
a
st
t7003: fix
s
ubdirector
y
-fi
l
t
e
r test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
J
ens Leh
m
ann
Add tests for the diff
.
ig
n
oreSubmo
d
ul
e
s conf
i
g op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Johannes Schinde
l
in
Ad
d
the 'dif
f
.
i
g
noreSubmod
u
les' config setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jens L
e
hma
n
n
Submodu
l
es: Use "igno
r
e"
s
e
ttings from
.
gitmodule
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
Submodul
e
s
: Add the
new "ignore" config o
p
tio
n
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
S
hawn O
.
Pearce
smart-http:
Don't deadlock on server
failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nied
e
r
Allow "che
c
k-re
f
-format --branch" from s
u
bdirectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
check-ref-format: handle su
b
commands
i
n
s
ep
a
rate functio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Junio C Hamano
M
erge git
:
//git
.
bogomips
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2010-08-05
Matthi
e
u
M
o
y
pretty-
o
ptions
.
txt: match --
f
ormat's documentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Ju
n
i
o
C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
next