repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sr/local-config'
2010-08-22
Junio C
Hamano
M
erge bra
n
ch
'
s
r/l
o
c
al-c
o
nfig'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch
'nd/fix-sp
a
rse-checko
u
t'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge b
r
a
n
ch 'hv/submod
u
le-find-ff-m
e
rge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge br
a
nch
'en/rebase-against-rebase-fix'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Haman
o
Merge
b
ra
n
ch 'dg/local-mo
d
-error-messages'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio
C
Ha
m
ano
M
erge bra
n
ch 'po/userdiff-c
s
harp'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge
branc
h
'ab/pe
r
l-
i
n
s
tall'
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-22
Jens Lehmann
t7403: add missing &
&
's
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mar
k
Rada
Tell ignore f
i
l
e
a
b
o
ut generate files in /gitweb/static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C H
a
m
a
n
o
M
erge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ha
m
an
o
Merg
e
br
a
nch 'jc/
m
a
i
nt-
f
ollow-rename-fix' into
maint
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C H
a
mano
Merge
branch '
j
n
/
maint-plug-leak' into maint
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C Ha
m
ano
M
erge
b
r
a
n
ch 'jn/fix
-
abbr
e
v
' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ham
a
n
o
M
e
r
g
e
b
ranch
'
vs/d
o
c
-
s
pell' into m
a
i
nt
commit
|
commitdiff
|
tree
2010-08-20
Junio C H
a
ma
n
o
Merge b
r
anch 'jn/rebase-rename-
a
m
'
int
o
main
t
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'jn/doc-pull' i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C Hamano
Merge branch
'bc/u
s
e-more-h
a
rdlinks-in-i
n
stall' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C Haman
o
Merg
e
branch 'tr/rfc-
r
eset-doc' into maint
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar
Ramachandra
builtin/
c
heck
o
ut: F
i
x message
w
h
en
switching to an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu Moy
xmal
l
oc: include size in the
f
ailure me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
J
u
nio C Hamano
Me
r
ge branch 'maint'
t
o sync with 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C H
a
mano
Git 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Ha
m
ano
Merge branch
'tr/xsi
z
e-bi
t
s
' int
o
maint
commit
|
commitdiff
|
tree
2010-08-19
Juni
o
C
H
amano
Mer
g
e branch
'jc
/
s
ha1-name-find-f
i
x' int
o
main
t
commit
|
commitdiff
|
tree
2010-08-18
Junio C H
a
mano
Merge branch 'sp/fix-smart
-
http-deadloc
k
-on-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Hamano
Merge bran
c
h 'jc
/
ma
i
n
t-fol
l
o
w
-
rename-fix'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
M
erge b
r
anch
'
t
f
/stri
n
g-list-init'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge br
a
nch 'c
c
/find-c
o
mmit
-
subject
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch
'
jn/mai
n
t-plug-leak
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ham
a
no
Merge branch
'jl
/
subm
o
d
ule-ignore
-
diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch '
m
l/rebase-x-
s
trategy'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
Hamano
Merge branch
'
jn/fix-abbrev'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Haman
o
Merge branch
'v
s
/doc-spell'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
Hama
n
o
Merge branch
'
j
h/us
e
-te
s
t-must
-
fail'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jh/cle
a
n-exclude'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch '
k
f/pos
t
-r
e
ce
i
ve
-
sam
p
le-h
o
o
k
'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C Hamano
M
e
rge br
a
nch 'ab/repo
r
t-cor
r
upt-ob
j
ect
-
wi
t
h-type
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
ano
Merge
branch 'jn/
r
ebase
-
rename-a
m
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
M
e
r
ge branch 'jn/fast-
i
mport-subtree
'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C H
a
mano
Merge branch
'
a
r/stri
n
g-
l
ist-fore
a
c
h'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
Haman
o
Me
r
ge br
a
nch 'jh/graph-nex
t
-
line'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Haman
o
M
e
rge branc
h
'tr/xsize
-
bits'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o
C Hama
n
o
M
erge
branch 'tc/checkout-B'
commit
|
commitdiff
|
tree
2010-08-17
David
Aguil
a
r
mergetool
:
Skip autoresolved paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Pet
r
Onder
k
a
Userdiff patterns
f
or C#
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Ævar Arnfjörð Bjarmason
l
o
g
: test for
r
eg
r
essi
o
n intr
o
duced in 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 Hamano
diff --follow
:
do
c
all diff
c
ore_std() as necessary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
J
unio C Hamano
d
iff --follow: d
o
no
t
waste cycles w
h
ile recursin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Æ
v
a
r Arnf
j
ö
r
ð
B
jarmason
perl/Make
f
ile: Unset INSTALL_
B
ASE when making perl
.
mak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull --reba
s
e: Avoid s
p
uri
o
u
s c
o
nflicts and reap
p
lying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t5520-pull: Add testcases sho
w
ing sp
u
rious conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch '
j
c/s
h
a1-name-fin
d
-
fix'
commit
|
commitdiff
|
tree
2010-08-13
Jun
i
o C Hamano
Merge branch 'jn/doc-pull'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
io
C Hamano
Me
r
ge branch 'jn/maint-gitweb-dynconf'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ham
a
n
o
Merg
e
branc
h
'bc/use-more
-
h
a
rdli
n
k
s
-
i
n-install'
commit
|
commitdiff
|
tree
2010-08-13
J
u
n
i
o C Hamano
Merge branch
'
t
r/
r
fc-reset
-
doc'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
io C Hamano
Merge branch 'jn/
p
ars
e
-
d
ate-basic'
commit
|
commitdiff
|
tree
2010-08-13
Junio C H
a
mano
Merge branch 'sp/fix-smar
t
-ht
t
p
-
deadlock-on-error'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-08-13
M
att
h
ieu Moy
push: mention "g
i
t p
u
ll" in error me
s
sage for non-fast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Jonathan N
i
eder
S
t
andardize do
{
.
.
.
} wh
i
l
e
(0)
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Brandon
C
asey
t
/t7003: replace \t with literal tab in sed expres
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
N
e
lson E
l
hage
in
d
ex-pack
:
Don't f
o
ll
o
w replace r
e
fs
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Ju
n
io C
H
amano
Merg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-08-11
Matthi
e
u Moy
post-rec
e
ive-email:
r
em
o
ve spur
i
ou
s
c
ommas
i
n
e
mail
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Raja
R H
a
ri
n
ath
f
ast-import: e
x
port cor
r
e
c
tl
y
m
a
rks larger than 2^20-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Æ
var Arnfjö
r
ð Bjarmason
t/li
b
-git-svn
.
sh: use
$
PERL_PATH
for perl,
n
o
t perl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Diane
G
asselin
t760
9
: test m
e
rge and c
h
e
c
kout
er
r
or mess
a
g
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Ma
t
th
i
e
u
Mo
y
unpack_trees: gr
o
u
p
error
mes
s
ages by ty
p
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthi
e
u Moy
merge-rec
u
rsive
:
distingu
i
sh
"r
e
moved" an
d
"overwritten
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Dia
n
e
G
a
sselin
merge-recurs
i
ve: porcel
a
in me
s
s
age
s
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
M
atthieu Moy
Tu
r
n unpack_
t
r
ees_options
.
msgs into an array + enum
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
w
ri
t
e-tre
e
: Avoid
leak when index refers
t
o an invalid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jo
n
athan Nieder
rea
d
-
t
ree:
s
top lea
k
ing tree objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jona
t
han Nieder
c
o
re: Stop leaki
n
g ondi
s
k_cache_entr
y
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jakub Na
r
ebski
d
i
ff: strip extra "/" whe
n
str
i
pping prefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Junio
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nied
e
r
gitweb: cla
r
ify search results pag
e
when no matching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
T
a
y Ray Chuan
b
uiltin/checkout: handle -B
from detached HEAD correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
J
onatha
n
Nieder
D
ocumentat
i
o
n: ad
d
a FILE
S
sect
i
on for sh
o
w-ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Nguyễn Thái Ngọc Duy
unpa
c
k-trees: mark
new
ent
r
ies
s
kip-
w
orkt
r
ee approp
r
iately
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
N
guyễn
T
hái Ngọc Duy
u
npac
k
-
t
rees: do no
t
c
heck fo
r
conflict entries too
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
N
gu
y
ễn Thái Ngọc Duy
unp
a
ck-trees: let rea
d
-tree -
u
remove inde
x
entries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ng
u
yễn
T
hái Ngọ
c
D
uy
unpack-tree
s
: only
c
lear CE_UPDATE|CE_REMOVE
when s
k
ip
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
J
onathan Nieder
Makefile
:
add
m
issi
n
g d
e
pe
n
dency on http
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan
Nieder
Makefile: add missing dep
e
n
dencies on url
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
M
i
chael J Gruber
D
o
c
ument
a
t
ion/git-log:
C
l
a
r
ify --full-diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Willy
T
a
r
reau
git-r
e
base: fix typo when p
a
rsing --force-r
e
base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ævar Ar
n
fjö
r
ð Bjarmason
imap-se
n
d
:
F
i
x s
p
r
intf
usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René Scha
r
fe
pr
u
n
e: a
l
l
o
w --dry-run fo
r
-n
and
--
v
erbose for -v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
notes
:
a
l
lo
w
--dry-r
u
n for -n a
n
d --
v
erb
o
se fo
r
-v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Junio
C
Ha
m
ano
Me
r
g
e
branch 'webrick' of git://git
.
bo
g
omips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-08-09
Matthi
e
u Moy
Doc
u
ment -B<n>[/<m>]
,
-M<n> a
n
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
D
ocu
m
en
t
atio
n
: cite git-am from git-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Thomas Rast
t
7
003:
f
ix subdire
c
tory-
f
ilt
e
r
tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
Add te
s
ts for the dif
f
.
ignoreSu
b
mo
d
ule
s
config op
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
J
ohannes
S
c
h
inde
l
in
Add
t
he 'diff
.
ignoreSubmodule
s
' config setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jen
s
Lehmann
Subm
o
dules: Use "ignore"
s
etti
n
g
s from
.
g
itm
o
du
l
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
Submodules: Add
t
h
e
n
e
w
"ignore" co
n
fig option for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next