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
Ju
n
io C Hamano
Merg
e
branch 'hv/submodul
e
-
find-ff-
m
erge'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
H
a
mano
Merge branch 'en/reb
a
se
-
agains
t
-
rebase-fix'
commit
|
commitdiff
|
tree
2010-08-22
J
unio
C
Hamano
Merg
e
branch 'dg/l
o
cal-m
o
d-error-messages'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
M
e
rge br
a
nch '
p
o/userdiff-cs
h
a
r
p
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Haman
o
Merge branch 'ab/perl-inst
a
ll'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Haman
o
Mer
g
e
b
ra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2010-08-22
Jens Lehma
n
n
t7403: ad
d
missing &&'s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mark
R
ada
T
e
l
l ign
o
re
f
il
e
about generate
files in /gitweb/s
t
a
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ham
a
no
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2010-08-20
J
unio C Hamano
Merge b
r
anch 'jc/maint-
f
ollow
-
ren
a
me
-
fix' into maint
commit
|
commitdiff
|
tree
2010-08-20
Juni
o
C Hamano
M
erge br
a
nch 'jn/maint-plug-l
e
ak' i
n
t
o
maint
commit
|
commitdiff
|
tree
2010-08-20
Ju
n
io
C
Haman
o
Merge branch 'jn
/
f
ix-ab
b
rev' into
maint
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
Hamano
Merge branch
'
vs/do
c
-spell' into ma
i
n
t
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch
'jn/rebase-re
n
ame-am' into
m
aint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ha
m
a
no
Merge branch
'
j
n
/doc-p
u
ll
'
into
maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'bc/use-
m
ore
-
har
d
l
i
nks-in-install' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
a
m
a
no
M
e
rge branch 'tr/r
f
c-reset
-
doc' into maint
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar
R
amachandra
builtin
/
checkout: Fix
message whe
n
sw
i
tchin
g
t
o
an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Matt
h
i
e
u Moy
x
m
a
llo
c
:
i
nc
l
ude
s
ize in the fai
l
ure
mess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
J
unio C Ham
a
no
Merge br
a
n
ch 'maint' to
s
ync with 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hama
n
o
Git 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
M
erge bra
n
c
h 't
r
/xs
i
z
e-bits' into maint
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
M
er
g
e b
r
anch
'
jc/sha1
-
n
a
m
e
-find-fi
x
' into
m
aint
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
io
C
Hamano
Merge branch '
s
p/fix
-
smart
-
htt
p
-
d
e
a
dlock-on-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Hamano
Merge bra
n
ch
'jc/maint-
f
oll
o
w-rena
m
e-fix'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branc
h
'tf
/
string-list-init'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
i
o C Ha
m
ano
Me
r
ge b
r
anch 'cc
/
find-commit-subject'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
Merge branch '
j
n/main
t
-plug-lea
k
'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
io C Hamano
Merge branch 'jl/subm
o
dule-ig
n
ore-diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge
branch 'ml/rebase-x-
s
trategy'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
io C
Hamano
Merge branch 'jn/fix-abbrev'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge br
a
nch 'vs/doc-spe
l
l'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
H
a
mano
Merge branch 'jh/
u
se-test
-
mus
t
-fail'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
i
o
C Ha
m
ano
Me
r
ge b
r
a
nch 'jh/cl
e
an-exclude'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
M
e
rge
bra
n
ch 'kf
/
post-receiv
e
-
s
am
p
le-ho
o
k'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
H
am
a
no
Merge
b
ranch 'ab/re
p
or
t
-corrupt
-
o
bject-with-type'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
a
no
Merge bra
n
c
h 'jn/r
e
base-r
e
name-am
'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
io C Hamano
M
erge bran
c
h
'
jn/fast-import-subtree'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
aman
o
M
e
r
g
e branch 'ar/str
i
ng-
l
i
st-foreach'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C Hamano
Merge branch 'jh/graph-n
e
xt-line'
commit
|
commitdiff
|
tree
2010-08-18
Junio C H
a
m
a
no
Merge
b
ran
c
h
'
t
r
/xsiz
e
-bi
t
s'
commit
|
commitdiff
|
tree
2010-08-18
Junio C H
a
mano
Merge branch 'tc/checkout-B'
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Ski
p
aut
o
res
o
lved paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Petr Onderka
Userdi
f
f patte
r
ns for C#
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Ævar Arnfjör
ð
Bjarmason
log: test for regression in
t
rod
u
ced
i
n
v1
.
7
.
2-rc0~103
^
2~2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Juni
o
C Haman
o
diff --follow: do call di
f
f
co
r
e_std() as necess
a
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
diff --fol
l
ow: do not waste cyc
l
e
s while
r
ecu
r
si
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Ævar A
r
nfjö
r
ð
Bjarm
a
son
perl/M
a
k
efile: Un
s
et
I
N
S
TALL_BASE
w
hen making perl
.
mak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elij
a
h
Newren
pull --rebase
:
Avoid
s
puriou
s
conf
l
icts
a
n
d
reapplying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
El
i
jah Newren
t5520-p
u
ll:
Add t
e
stcases showing spuri
o
us confl
i
cts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
J
unio C
H
a
m
ano
Merg
e
branch 'jc/
s
ha1-na
m
e-find-f
i
x'
commit
|
commitdiff
|
tree
2010-08-13
Junio
C
Ha
m
ano
Merge b
r
anch 'jn/d
o
c-pull'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'jn
/
main
t
-gitweb-dy
n
c
on
f
'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
io C Hamano
M
e
rg
e
branc
h
'bc/use-m
o
re-h
a
rd
l
inks-in-in
s
tall'
commit
|
commitdiff
|
tree
2010-08-13
Junio C
H
amano
Merg
e
branch 'tr/r
f
c-reset-d
o
c'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge br
a
nch
'jn/p
a
r
se-date-basic'
commit
|
commitdiff
|
tree
2010-08-13
Junio
C Ham
a
no
Merge
b
r
anch 'sp/f
i
x-smart-http-deadlock
-
on
-
error
'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hama
n
o
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-08-13
Matth
i
eu M
o
y
p
u
s
h: mention "git p
u
ll"
i
n
error message for n
o
n-fa
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Jonathan Nieder
Stand
a
rdize do {
.
.
.
} while (
0
) styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Brandon Casey
t/t
7
003:
r
e
p
lac
e
\t with literal tab in
sed expres
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Nelson E
l
hage
index-pa
c
k: Don't fo
l
low re
p
lace refs
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Juni
o
C Ha
m
ano
M
erge
b
ranc
h
'maint
'
commit
|
commitdiff
|
tree
2010-08-11
Matt
h
ieu Moy
p
o
st-
r
eceive-
e
mail: remove
s
p
u
r
i
ous commas in
email
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Raja R H
a
rinath
fas
t
-import: exp
o
r
t
correctly mar
k
s larg
e
r
than 2
^
20-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Ævar Arnfjör
ð
Bjarm
a
son
t/li
b
-git-svn
.
sh: use $PERL_PAT
H
f
o
r
perl, not perl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Diane G
a
sselin
t7609: test merge and chec
k
out erro
r
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
M
atthieu Moy
unpack_trees:
g
r
o
u
p
error messages
b
y type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
merge-recursive: disting
u
ish
"
removed" and "overwritten
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Dian
e
Gasselin
merge-r
e
cursi
v
e: porcelain messages for 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
M
oy
Turn unpack_trees_options
.
msgs into an ar
r
ay + e
n
um
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
writ
e
-tree: Avoid le
a
k when ind
e
x refers to an invalid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nie
d
er
read-tree: stop leak
i
ng tree obj
e
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
J
o
nathan Nieder
core: Sto
p
lea
k
i
n
g
ondisk
_
c
a
che_entr
y
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jakub Nare
b
ski
diff: strip extra
"
/" when stripping
p
r
e
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Junio
C
Haman
o
Me
r
ge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
gitwe
b
: clarify search re
s
ul
t
s
page when no matching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
T
ay Ray
C
huan
builtin/checkout: h
a
ndle -B from
det
a
ched HEAD correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Doc
u
me
n
tation: add a FI
L
ES section for show-re
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonath
a
n Nieder
Makefile: add mi
s
sing dependency o
n
htt
p
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan
Nieder
Makefile: add missing dependencies on u
r
l
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Michael
J
G
r
uber
Documentation/git-log: Clarify -
-
full
-
diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Willy Ta
r
r
ea
u
git-r
e
ba
s
e: fix typo when parsin
g
--fo
r
c
e
-
r
e
base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ævar A
r
nfjörð Bj
a
rm
a
son
imap
-
s
e
nd
:
Fix s
p
rintf u
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
pr
u
ne: al
l
o
w
--dry-r
u
n for -n and --verbose for -v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
n
otes
:
allow --dry-run for
-
n and --verbose fo
r
-v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Junio C H
a
m
a
no
M
erge branch
'webr
i
ck' o
f
git:
/
/
g
i
t
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-08-09
Matthieu
Moy
Document
-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 K
i
n
g
Documenta
t
ion: ci
t
e
git-am from git-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Thom
a
s R
a
s
t
t7003: fix subdirectory-filte
r
t
e
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
Add
tests for
t
he diff
.
ign
o
reSubmodules config option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
J
o
hannes Sc
h
indeli
n
Add
the 'd
i
ff
.
ignoreSubmodules'
c
o
n
fig
setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jens Leh
m
ann
Submodules: Use "ignore" settin
g
s from
.
gitmodules
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
Submod
u
les:
A
dd th
e
new "ignore" co
n
f
ig option for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Shawn O
.
P
earce
sma
r
t-http:
Don't deadlock on se
r
ver fail
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan
Nieder
Allow
"check-ref-f
o
r
m
at --bran
c
h" from subdir
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than Nieder
c
h
e
c
k-
r
ef-format: handle
subcommands
in se
p
arate fu
n
cti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Junio C Hamano
Merge git
:
//git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-08-05
M
att
h
ie
u
M
o
y
pretty-options
.
txt: match --fo
r
m
a
t's documentat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Ham
a
no
Merge
branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
next