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 Hamano
Merge branch 'hv/
s
ubmo
d
ule-fin
d
-ff-merge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C H
a
mano
Merge branc
h
'en/rebase
-
against-rebase-
f
ix'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio C H
a
mano
Merge bran
c
h
'
d
g/local-mod
-
error-me
s
s
ages'
commit
|
commitdiff
|
tree
2010-08-22
Junio C H
a
mano
Mer
g
e branch '
p
o
/
use
r
d
i
ff-csharp'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
M
erge br
a
nch 'ab/perl-inst
a
l
l'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-08-22
Jens Lehman
n
t7403: add mis
s
ing &&'s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mar
k
Rada
T
el
l
ignore
f
ile about genera
t
e files i
n
/
g
i
t
w
eb/stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C H
a
m
a
no
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ha
m
ano
Mer
g
e
branch 'jc/m
a
int-follow
-
r
e
name-f
i
x
' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C Hamano
M
e
rge branch 'jn
/
maint
-
p
l
u
g
-l
e
ak' i
n
to maint
commit
|
commitdiff
|
tree
2010-08-20
J
unio C
H
ama
n
o
Merge branch
'
jn/fix-abbr
e
v' into maint
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o
C Hamano
Merge branch 'vs/doc
-
spel
l
' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'jn
/
rebase
-
rename-am' into
mai
n
t
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C
Hama
n
o
Merge bra
n
c
h 'jn/doc-pull
'
into
ma
i
nt
commit
|
commitdiff
|
tree
2010-08-20
Junio C
Hamano
Mer
g
e branch 'bc/use-more-hardlink
s
-in-
i
nst
a
ll' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Juni
o
C
H
a
mano
Merge
b
r
anch
'tr/rf
c
-
r
eset-doc' into maint
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar Ram
a
chandra
built
i
n/ch
e
ck
o
ut:
Fix m
e
ssage when s
w
it
c
hing to an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Ma
t
t
hieu
M
oy
x
malloc:
include size in
the
f
ailure m
e
ssa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio
C Ham
a
no
M
e
rge b
r
anch
'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 Hama
n
o
Merg
e
branch
'
t
r/xsize-bits' into maint
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Merge
branch
'
jc/sha1-name-find-fix' into m
a
int
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Hamano
Mer
g
e branch 'sp
/
fix-smart-http-deadl
o
ck-on-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Junio C H
a
m
a
n
o
Merge
b
r
anch
'j
c
/m
a
int-follow-rename-fix'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
M
e
rge branch 'tf
/
string-
l
ist-init
'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Hamano
Mer
g
e branch 'cc/find
-
commit-s
u
b
j
ect'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
H
a
m
ano
Me
r
ge branch 'jn/m
a
int-plu
g
-leak'
commit
|
commitdiff
|
tree
2010-08-18
J
unio
C
Hamano
Merge branch 'jl/submodul
e
-
i
gnore-diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Me
r
ge bra
n
ch 'ml/r
e
base-x-strategy
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jn/fix-abb
r
ev'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
a
m
ano
Merge b
r
a
n
ch 'vs/do
c
-spell'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
io C
Hamano
Merge
b
ranch 'jh/use-test-must-fail'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge bran
c
h '
j
h/clean-excl
u
de'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
ano
Merge
b
ranch 'kf/post-rec
e
i
ve-sample-hook
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
amano
Mer
g
e branch 'ab/r
e
port-
c
orr
u
pt
-
obj
e
ct-with-type'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jn/rebase-ren
a
me-
a
m'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Ham
a
no
Merge branch 'jn/f
a
st-im
p
ort-subtree'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
Merg
e
branch 'a
r
/
stri
n
g
-
l
i
st-forea
c
h'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
amano
Merge branch '
j
h
/
graph-ne
x
t-l
i
ne'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge
bran
c
h 'tr/xsize-bits'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C Hama
n
o
Merge branch 'tc/
c
heckout-B'
commit
|
commitdiff
|
tree
2010-08-17
D
a
v
id Aguilar
mergetool: Skip a
u
toresolv
e
d
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Pe
t
r On
d
erka
Userdiff patterns for
C#
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Æv
a
r Arn
f
jörð Bj
a
rma
s
on
log: test for regress
i
o
n
introdu
c
ed i
n
v1
.
7
.
2-rc0~103^2~2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
io C Hamano
diff --follow: do call
d
i
f
fcore_std() as nec
e
ssa
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Haman
o
diff --
f
oll
o
w: do not wast
e
cycl
e
s while re
c
ursin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Ævar Ar
n
fjörð Bjar
m
ason
perl/
M
akefile:
Unset INSTALL_BASE whe
n
making
perl
.
m
a
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull
--rebase: Avoid
s
purious co
n
fli
c
ts
and reapplying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Ne
w
ren
t5520-pull: A
d
d testcases
showing spurio
u
s
conflict
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
J
u
nio
C
Hamano
Me
r
g
e
branch '
j
c/s
h
a1-na
m
e-find-fix'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge bra
n
ch 'jn/doc-pull'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branc
h
'jn/mai
n
t
-
gitweb-dync
o
nf'
commit
|
commitdiff
|
tree
2010-08-13
J
u
nio C
H
amano
Merg
e
branch 'bc/
u
se-more-hardlinks-in-install'
commit
|
commitdiff
|
tree
2010-08-13
Jun
i
o C Ha
m
ano
M
erge
b
ran
c
h 'tr/r
f
c-reset-doc'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge bran
c
h 'jn/parse-date-basic'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
i
o C Hamano
M
e
rge branch 'sp/fi
x
-smart-ht
t
p
-
d
ea
d
lock-on-error'
commit
|
commitdiff
|
tree
2010-08-13
Junio
C
Hamano
M
e
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-08-13
M
a
tthieu Mo
y
push:
m
e
n
tion
"
git pull" in e
r
ror mess
a
ge for n
o
n
-
fast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
J
o
nathan Nieder
St
a
ndardize do {
.
.
.
} while (0) s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Brando
n
Case
y
t
/
t
7003: replace \t with literal tab i
n
s
e
d expr
e
s
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Nelson Elhage
i
n
dex-pack: Don't follow replace r
e
fs
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Junio C
Hamano
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2010-08-11
Matthi
e
u
Mo
y
post
-
r
e
cei
v
e
-email: remove spurious
c
ommas i
n
email
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Raja R
H
arina
t
h
f
ast-import: e
x
po
r
t corre
c
tly marks larg
e
r than 2
^
20-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Ævar
A
rnfjö
r
ð Bjarmason
t/l
i
b-gi
t
-svn
.
sh: use $PE
R
L_PATH for p
e
rl, not per
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
D
iane Gasselin
t7609: test merge an
d
che
c
k
o
ut error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matt
h
ieu
M
oy
unpa
c
k_t
r
ees
:
group error messag
e
s
by
type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
M
a
tthieu Moy
me
r
ge-recursi
v
e: distinguish
"rem
o
ved" a
n
d "overwri
t
ten
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Diane Gasselin
merge-
r
ecursive: po
r
celain
m
e
s
sages fo
r
checkout
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 Moy
Turn unpack
_
tre
e
s_optio
n
s
.
msgs into an array
+
enum
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
write-t
r
ee: Avoid
l
eak when index ref
e
r
s to an inv
a
l
i
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
J
o
n
a
than
N
ieder
read
-
tree: stop leaki
n
g tree objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
core: Stop leaking ondisk_cache_
e
ntry
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jaku
b
Narebski
d
i
ff: strip extr
a
"/" wh
e
n
s
tri
p
p
i
ng prefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Junio C Ham
a
no
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-08-09
J
onathan Nied
e
r
gitweb: clarify searc
h
results p
a
ge
w
hen
n
o
matching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Tay Ray Chuan
buil
t
in/checkout:
handle
-
B
f
r
om detached HE
A
D correct
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
D
o
cumentation: add
a
FILES secti
o
n f
o
r
s
how-ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonath
a
n
Nieder
Makefile: add mi
s
sing d
e
p
en
d
ency
o
n http
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonatha
n
Nieder
Makefi
l
e
:
a
d
d miss
i
n
g
dep
e
n
denc
i
es on url
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Michael
J
G
r
u
ber
D
o
cu
m
ent
a
tion/git-l
o
g: Clarify --full
-
diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Willy Tarreau
git-
r
ebase: fix typo
w
hen parsing
-
-
forc
e
-
r
ebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ævar Ar
n
fjörð B
j
armason
imap-send: Fi
x
sprintf
usag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René S
c
harfe
prune: allow --dry
-
run for -n a
n
d
--
v
erbose for
-v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
n
o
t
es:
a
l
l
ow
-
-dry-
r
un for -n an
d
--verbos
e
f
or -v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
J
u
nio
C Hamano
Merge branch 'webrick' of git://git
.
bogomips
.
org/gi
t
-
s
vn
commit
|
commitdiff
|
tree
2010-08-09
Matthieu Moy
Document -
B
<
n
>
[
/<m>], -M<n> an
d
-
C<n> varia
n
ts of
.
.
.
from the explanations of
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Brad King
Document
a
tion: ci
t
e gi
t
-am from git-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Thomas Ra
s
t
t
7003: fix subdi
r
ect
o
ry-filt
e
r
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jens
L
e
hma
n
n
Add test
s
for the d
i
ff
.
ignoreSu
b
modules config
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
J
o
hanne
s
Sc
h
indelin
Add the 'diff
.
ign
o
re
S
ubmod
u
les' config setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
J
ens Lehmann
Submodules:
U
s
e "igno
r
e
"
settings from
.
gitmodules
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jens L
e
hm
a
nn
Submodules
:
A
d
d
t
h
e new "
i
gnore" co
n
fig option for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
S
h
awn O
.
Pearce
sma
r
t-ht
t
p:
Don't deadlock
on serve
r
failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
Allow "check-
r
e
f-format --b
r
anch" from subdirec
t
ory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
der
ch
e
c
k-r
e
f-for
m
at:
h
andle subcommands
in separate fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Junio
C H
a
mano
M
erge
git://git
.
b
o
gomip
s
.
org/
g
it-
s
vn
commit
|
commitdiff
|
tree
2010-08-05
Matthie
u
Moy
pretty-options
.
t
x
t: matc
h
-
-format
'
s d
o
c
u
m
ent
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Juni
o
C
H
aman
o
Merge b
r
anch '
m
a
int'
commit
|
commitdiff
|
tree
next