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 'mm/shortopt-detached'
2010-08-22
Ju
n
io C Ham
a
no
Merge branch '
m
m/shortop
t
-detac
h
ed'
commit
|
commitdiff
|
tree
2010-08-22
Juni
o
C Haman
o
Me
r
g
e
branch 'sr/local-config'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ham
a
no
M
e
r
g
e branch 'nd/f
i
x-s
p
a
rse-ch
e
ckout'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C Haman
o
Merge branch 'h
v
/submodule-find-ff-m
e
rge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
M
e
rge branch
'en/re
b
a
se-ag
a
ins
t
-re
b
ase-f
i
x'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Hama
n
o
Merge bran
c
h
'dg/
l
ocal-mod-error-messag
e
s'
commit
|
commitdiff
|
tree
2010-08-22
J
u
n
i
o
C
Hamano
M
erge
branch
'
po/userdiff-csh
a
r
p
'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio C Ham
a
no
Merg
e
br
a
nch 'ab/perl-install'
commit
|
commitdiff
|
tree
2010-08-22
Junio C H
a
m
an
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-08-22
Je
n
s Leh
m
ann
t7403: add
mis
s
i
n
g &&'s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mark Rada
Tell ig
n
o
r
e file about
g
enera
t
e files
i
n /gitweb/static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Me
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-08-20
Junio C Haman
o
Mer
g
e br
a
nch
'
jc/maint-follow-ren
a
me-fix' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branc
h
'jn/mai
n
t
-plug-lea
k
' i
n
t
o maint
commit
|
commitdiff
|
tree
2010-08-20
J
unio C Haman
o
M
erge branch 'jn/fix-abbr
e
v' int
o
main
t
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Me
r
ge branch 'v
s
/doc-spell' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
u
n
io C Haman
o
M
e
r
g
e branch 'jn/rebase-rename-am' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C
H
amano
Merge branch 'jn/doc-p
u
l
l
' into m
a
int
commit
|
commitdiff
|
tree
2010-08-20
Junio C H
a
m
ano
Merge branch 'bc/us
e
-more-hardlinks-in
-
install' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C Haman
o
Merge
b
r
anch
'tr/rfc-reset-do
c
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-08-20
Ramkum
a
r Ramachandra
builtin
/
ch
e
ckout: Fix message when swi
t
ching to an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
M
atthieu Moy
xm
a
lloc: include s
i
ze in
t
he f
a
ilu
r
e message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
J
u
nio C Haman
o
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
r
anch 'tr/x
s
ize-bits' into maint
commit
|
commitdiff
|
tree
2010-08-19
Ju
n
io C H
a
mano
Merge branch 'jc/sha1-n
a
me-find
-
fix' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Ha
m
ano
M
e
rge branch '
s
p/f
i
x-smar
t
-
h
ttp-deadlock-on-erro
r
'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
J
unio
C Hamano
Merge branch 'jc/maint-follow-rename-fix'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Mer
g
e
br
a
nch 'tf/string-list-init'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge
b
ra
n
ch 'cc/fi
n
d-commit-subje
c
t'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C
Hamano
Merg
e
br
a
nch 'jn/ma
i
nt-plug-leak'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
io C Hamano
Merge
b
ranch 'j
l
/submodule-igno
r
e
-diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Haman
o
Merg
e
bra
n
c
h
'
m
l/reb
a
se-x-strategy'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
io C Ham
a
no
Me
r
g
e
b
ranch 'jn/fi
x
-abbrev'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'vs/do
c
-s
p
el
l
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C H
a
man
o
Merge branch 'jh/
u
se-te
s
t-must-fail'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge br
a
nch 'jh/cl
e
an-excl
u
d
e
'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Hama
n
o
M
e
rge branch 'kf/post-receive-s
a
mp
l
e
-
hook'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
Me
r
ge branc
h
'ab/re
p
ort-
c
orrupt-ob
j
ect-with-t
y
pe'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
M
e
rge branch 'j
n
/rebase-ren
a
m
e-am'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
io
C
H
aman
o
Merge branch 'jn/fast-import-subtree'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
io C
H
amano
M
e
rge b
r
anch
'
ar/str
i
ng-
l
ist-foreach'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
ano
Me
r
ge branch 'jh/graph-ne
x
t
-
li
n
e'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
M
e
r
g
e
b
ranch 'tr/xsize-bits'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
io C Hamano
Mer
g
e
b
ranc
h
't
c
/checkout-B'
commit
|
commitdiff
|
tree
2010-08-17
David
A
guilar
mergetool: Sk
i
p autoresolved paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Petr On
d
er
k
a
Userdiff patterns fo
r
C#
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Ævar Arn
f
jörð Bjarmason
log: test for regression intr
o
duced in v1
.
7
.
2-r
c
0~1
0
3
^
2~2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C
Hamano
diff -
-
foll
o
w: do c
a
ll diffcore_std() as
n
ecessar
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hama
n
o
diff --foll
o
w
:
do not was
t
e cycles
w
hile recu
r
s
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Æva
r
Arnfjö
r
ð Bjarmas
o
n
p
er
l
/Ma
k
efile: Unset
I
NSTALL_BA
S
E
whe
n
mak
i
ng
per
l
.
mak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newr
e
n
pull --r
e
base: Avoid s
p
urious c
o
n
f
licts and re
a
pplying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah
N
ewren
t
5520-pull: Add testcases showing spuri
o
us conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hama
n
o
Merge branch
'jc/sha1-name-find-fix'
commit
|
commitdiff
|
tree
2010-08-13
Junio
C Hamano
M
e
r
g
e
branch 'jn/do
c
-pull
'
commit
|
commitdiff
|
tree
2010-08-13
J
un
i
o C H
a
m
ano
Merge br
a
nch 'jn/maint-gitweb-dynconf'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'b
c
/us
e
-
mo
r
e-hardl
i
nks-in
-
i
nsta
l
l'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge bran
c
h 'tr/rfc
-
reset
-
doc'
commit
|
commitdiff
|
tree
2010-08-13
J
u
n
i
o C Hamano
Merge bra
n
ch 'jn/parse-dat
e
-
basic'
commit
|
commitdiff
|
tree
2010-08-13
J
unio C
H
amano
Merge b
r
anch '
s
p/fix-smart-http-deadlock-
o
n-error'
commit
|
commitdiff
|
tree
2010-08-13
Jun
i
o C Hamano
M
e
r
ge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2010-08-13
Matthieu Moy
p
ush: me
n
tion "git
pull" in
error m
e
ssage for non
-
fast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Jonathan Ni
e
d
er
Standardize d
o
{
.
.
.
} wh
i
l
e
(
0) st
y
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Bran
d
on Casey
t/t70
0
3: replace \t
w
ith
literal ta
b
in sed expre
s
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Nelso
n
Elhage
index-pack: D
o
n't follow repla
c
e
refs
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Junio C Ham
a
no
Merge bra
n
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-08-11
Mat
t
h
ie
u
Moy
post-receive-em
a
il: remo
v
e spurious co
m
mas in email
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Raja R
H
arinath
fast
-
import:
export correctly marks larger tha
n
2^20-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Ævar Arnfjörð Bj
a
rmason
t/lib-git
-
svn
.
sh: use $PERL_PATH for perl, not perl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Dian
e
Ga
s
selin
t
7
609
:
t
est
merge an
d
checkout
err
o
r
m
essa
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
unpack_trees: g
r
o
up
e
rro
r
messages by type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
merge-recursive:
distinguis
h
"removed" an
d
"ov
e
rw
r
it
t
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
D
iane Gasselin
merge-recursive: porcelain
messages for chec
k
out
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
Turn unpack_tree
s
_options
.
msgs into
a
n
a
rray + enum
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
wr
i
t
e-tree: A
v
oid leak when index refers to
an i
n
val
i
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jo
n
athan Nieder
read-t
r
ee: stop lea
k
i
ng
tree objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
J
onathan Nieder
core: Stop le
a
king ondisk_cache_entrys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jaku
b
N
a
rebski
diff: strip
extra
"
/"
w
hen stripping
prefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ju
n
io C Hamano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2010-08-09
Jonathan
N
ie
d
er
g
i
tweb: clarify se
a
rch
r
e
sults
p
age when no matching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ta
y
R
ay
C
h
u
an
b
ui
l
ti
n
/checkout: handle -B
f
rom detached HE
A
D
c
orr
e
ct
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan
Ni
e
der
Documentatio
n
: ad
d
a FILES secti
o
n for show-ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Nguyễn
Thái Ngọc Duy
unpack-trees
:
m
ark new entries skip-worktree
a
pprop
r
i
a
tely
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Nguyễn
T
h
á
i Ngọ
c
Duy
un
p
ack-trees: do
n
o
t
c
h
e
ck for confl
i
ct entri
e
s too
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Nguyễn Thái
Ngọc Duy
unpack-trees: let rea
d
-tree
-u
re
m
o
v
e index
entries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Nguyễn
T
h
á
i
Ngọc Duy
un
p
ack-trees: only clear CE_UPDATE|CE_REMOVE
w
hen skip
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Make
f
ile:
a
dd missi
n
g de
p
endenc
y
on htt
p
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonat
h
an N
i
eder
Makefil
e
: add missing d
e
pendencies on url
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Mic
h
ael J
Gruber
Documentation
/
git-log: C
l
arify
-
-f
u
l
l-diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Willy Tarreau
gi
t
-r
e
base: fix typo when parsing --f
o
rce-re
b
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ævar Arnfjörð Bjarmason
imap-send: Fix sp
r
intf usa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René S
c
harfe
prune:
a
llow
-
-dry-run fo
r
-n and --verbose for -v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
R
ené
S
c
har
f
e
notes: allow --dr
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 H
a
mano
M
e
rge branch
'
webrick'
o
f gi
t
://git
.
b
o
g
o
mips
.
org/
g
it-svn
commit
|
commitdiff
|
tree
2010-08-09
Matthieu Moy
Docum
e
nt -B<n>[
/
<
m>], -M<n> and -C<n> variants of
.
.
.
from the explanations of
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Br
a
d King
Docum
e
ntat
i
on: cite g
i
t-am from git
-
apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
T
h
oma
s
Rast
t
7003: fix subdi
r
ectory-filte
r
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
J
e
n
s
L
ehmann
Add tests for the diff
.
ignoreS
u
b
modules config opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Johannes
S
chindelin
Add the 'diff
.
ignoreSubmodule
s
'
c
o
n
f
ig setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jen
s
Lehmann
S
u
bmodules: Use "ignor
e
" setti
n
gs from
.
g
itmodules
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next