repo.or.cz
/
git
/
jnareb-git
/
bp-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 Ha
m
a
n
o
Merg
e
branch '
h
v/su
b
module-find-ff-merge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merg
e
branch 'en/re
b
ase-against-rebase
-
fix'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
Hamano
Mer
g
e branch 'dg/local-mod-error-messages'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio C Ha
m
a
no
Merge branch 'p
o
/us
e
rdiff
-
c
s
harp'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Ham
a
no
Merge branch '
a
b/perl
-
install'
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io C Hamano
Merg
e
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2010-08-22
J
e
ns
L
e
h
mann
t7403: add missing
&&'
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Mark Rada
Tell ignor
e
f
ile
abou
t
ge
n
erate
f
iles
in /gitweb/static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Junio C H
a
mano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
amano
M
e
rge branch 'jc/
m
a
int-follow-renam
e
-
f
ix' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2010-08-20
Juni
o
C Hamano
Merge
branch
'
j
n/
m
a
i
nt-p
l
ug-leak' int
o
maint
commit
|
commitdiff
|
tree
2010-08-20
J
unio C Hamano
Me
r
ge br
a
nch 'jn/fix-abbrev' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C H
a
mano
Merge branch '
v
s
/doc-spe
l
l' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
unio C
H
amano
M
erge branch
'
j
n/rebase-re
n
ame-am'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Me
r
ge branch 'jn/
d
oc-pu
l
l' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-08-20
Juni
o
C Hamano
Merge branch 'bc/use-
m
ore-ha
r
dlink
s
-in-install
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
J
un
i
o C
Ham
a
no
Merge branch 'tr/rfc
-
reset
-
doc' into
maint
commit
|
commitdiff
|
tree
2010-08-20
Ramku
m
ar
R
amachan
d
ra
builtin
/
ch
e
ck
o
ut: Fix message when switching
to an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu
M
oy
xmallo
c
:
inc
l
ude
s
ize in th
e
failure message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Ju
n
io C Ham
a
n
o
Merge b
r
anch '
m
aint' to s
y
nc
w
ith
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 Hama
n
o
M
erge
branch 'tr/x
s
ize-bits' into m
a
int
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Me
r
ge
b
ranc
h
'jc/sh
a
1-
n
ame-find-f
i
x' into maint
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o
C
Hamano
Merge br
a
nch 'sp/fix-smart-htt
p
-dea
d
loc
k
-o
n
-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge bran
c
h 'jc/maint-foll
o
w
-rena
m
e-fix'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C Hamano
Mer
g
e branch
'
tf/
s
tring-list
-
init'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'cc
/
find-
c
om
m
i
t-subje
c
t'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
M
erge branch '
j
n/maint-p
l
ug-leak'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Mer
g
e branch 'jl/subm
o
dule-ignore-d
i
f
f
'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Hamano
Merge
branch
'
m
l/reb
a
s
e-x
-
stra
t
e
gy'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Ham
a
no
M
e
rge branch 'jn/fix-abbrev'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
amano
Merge branch 'vs/doc-
s
pell'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
ano
Merge b
r
anch 'jh
/
use-
t
e
s
t-m
u
st-fail'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C Hama
n
o
Me
r
ge branch 'jh/clean-exc
l
ude'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C
Hamano
Merge branch 'kf/post-receive-sample-hook'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge bran
c
h
'ab/report
-
corrupt-obj
e
ct-with-type
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
M
e
rge branch
'
jn/reb
a
se-renam
e
-
a
m'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Mer
g
e branch '
j
n/fast-
i
mpo
r
t-subtree'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C
Hamano
Merge branch
'ar/s
t
r
ing-list
-
fo
r
each'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio
C
H
amano
Merge
b
ranch 'jh
/
grap
h
-next-line'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
an
o
M
erge bra
n
ch '
t
r
/xsize-
b
its'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Hamano
Mer
g
e br
a
nch
'tc/c
h
eckout-B'
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
Aguilar
m
e
rge
t
ool: Skip autoresolved
p
aths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-17
P
et
r
Onderka
Userdiff
patterns
f
or C#
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Ævar
A
rn
f
j
ö
rð
B
jarmason
lo
g
:
t
est for regres
s
ion introduced 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
--
f
o
l
l
ow: do call dif
f
core_std()
as
necessary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
J
unio C Ha
m
a
n
o
diff --f
o
llow: do not waste
c
ycle
s
while
recursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Ævar Arn
f
jörð
B
jarmason
perl/Makefile: Unset INSTALL_BA
S
E
wh
e
n makin
g
per
l
.
mak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah N
e
w
r
e
n
pull --r
e
base: Avo
i
d spurious conflicts
a
n
d reapplying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t5520-pull:
Add t
e
stcases showing spurious
c
onfl
i
c
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
M
er
g
e
b
ran
c
h 'jc/sh
a
1-nam
e
-fi
n
d
-
fix'
commit
|
commitdiff
|
tree
2010-08-13
Junio C
Hamano
Merge b
r
anch
'
jn/
d
o
c
-pull'
commit
|
commitdiff
|
tree
2010-08-13
Junio C H
a
mano
Mer
g
e
branch 'jn/maint-g
i
t
web-dynconf'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
M
e
rge
br
a
n
ch 'bc
/
use-
m
ore-hardlinks-i
n
-inst
a
l
l
'
commit
|
commitdiff
|
tree
2010-08-13
Junio C
Hama
n
o
Merge
b
ranch 'tr/rfc-reset-doc'
commit
|
commitdiff
|
tree
2010-08-13
J
unio C
Hamano
Me
r
ge branch 'jn/parse-dat
e
-
b
asi
c
'
commit
|
commitdiff
|
tree
2010-08-13
J
unio C Hamano
Me
r
g
e
b
ranch 'sp/fix-smart-http-deadlock-on-error'
commit
|
commitdiff
|
tree
2010-08-13
Jun
i
o
C Hamano
Me
r
ge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-08-13
Matth
i
eu Moy
push: mention "git pull"
i
n error message fo
r
no
n
-fast
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
J
o
nathan
N
i
eder
S
tandardize do {
.
.
.
}
while (0) sty
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Brandon Casey
t/t7003: replace \
t
wi
t
h literal
tab in sed
e
xpres
s
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Nelson Elh
a
ge
index-pack: Don't follow replace re
f
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Junio C Hama
n
o
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2010-08-11
M
at
t
hieu Moy
p
o
st-receive-
e
m
a
i
l: remove spuriou
s
c
o
mmas in email
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Ra
j
a R Harin
a
th
f
a
s
t-import: export correct
l
y
m
ar
k
s la
r
ger t
h
an 2^
2
0-
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 $PE
R
L_PATH fo
r
p
e
rl, not
p
erl
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Diane Gassel
i
n
t7609: test
m
erge and
c
heckou
t
error me
s
sag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
unpack_trees: g
r
oup
e
rro
r
messages by ty
p
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
merg
e
-recursive: distin
g
u
i
sh
"
removed" and "o
v
e
r
written
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Dia
n
e
Gasselin
mer
g
e-recur
s
ive
:
po
r
c
e
lain m
e
ssages f
o
r checkout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
Turn unpack_tree
s
_options
.
msgs into an arr
a
y + enum
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan
Nieder
wri
t
e-
t
ree: Avoi
d
leak when index r
e
fers to an invalid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
read-tr
e
e: stop leaking tree
o
bjects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jonatha
n
N
iede
r
core:
Stop leaking on
d
isk_ca
c
he_en
t
ry
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jakub Narebski
diff: strip ext
r
a "/" whe
n
stripping prefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Ju
n
io C Hamano
Merge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-08-09
J
on
a
than Nieder
gitweb: clarify
s
earch re
s
ults page
when no matching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Tay Ra
y
Chuan
builtin/
c
heckout: han
d
le -B from
detached HEA
D
corr
e
c
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan
Nieder
Docu
m
en
t
a
tion: add
a
FILES section for show-ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jo
n
at
h
a
n
Nied
e
r
Makefi
l
e: add missi
n
g
depend
e
ncy on http
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Ma
k
efile: add missing dependencie
s
o
n ur
l
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
M
ichael J
Gruber
D
o
c
u
mentation
/
git-
l
og:
Clarify --fu
l
l-diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Wi
l
ly Tarreau
git-rebase: f
i
x typo wh
e
n parsing --f
o
rce-rebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Æ
v
ar
A
rnfjö
r
ð
B
j
a
r
mason
imap-send: Fi
x
s
p
rintf usag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
R
e
né Scharfe
prune
:
allow --dry-
r
un for -n and --ver
b
ose fo
r
-v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René Schar
f
e
no
t
e
s: a
l
low --dry-run for -
n
and --ver
b
ose for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Junio C Hama
n
o
Merge branc
h
'
webrick' of git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-08-09
M
at
t
hi
e
u Moy
Document -B<n>[/<m>], -M<n
>
and -C<n> variants o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Brad Ki
n
g
D
oc
u
mentation: cite g
i
t-am
from git-apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Thomas R
a
st
t7
0
03: fix s
u
bdirector
y
-filter test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
Add tests for the diff
.
igno
r
eS
u
bmodules co
n
fig optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Johannes Schindelin
Add the
'diff
.
ignoreSubmodules' co
n
f
i
g setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
J
e
ns Lehmann
S
u
bmo
d
ules:
Use
"
ignore" settings
f
rom
.
gitmodu
l
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jen
s
Lehmann
Submodules: Add the
n
e
w "i
g
nore" c
o
nfig option for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
S
h
a
wn O
.
Pearce
smart-http:
Don't deadlock on ser
v
er
f
ailure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
eder
Allow "chec
k
-ref-form
a
t --branch" from s
u
bdirecto
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
natha
n
Nieder
check-
r
ef-format: handle subcommands in separ
a
te
f
unctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Juni
o
C Hamano
M
e
rge git://git
.
bogomips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2010-08-05
Matth
i
eu Mo
y
pretty-options
.
txt: match --format's documentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
J
u
nio
C
Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next