repo.or.cz
/
git
/
dscho.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
J
u
nio C Hamano
Merge
branch 'hv/su
b
module-
f
ind-ff
-
merge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Haman
o
Merge branch 'en/rebase-against-reb
a
se-fi
x
'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio
C
Hamano
Mer
g
e branch 'dg/
l
ocal-mod-error-messages'
commit
|
commitdiff
|
tree
2010-08-22
Junio C
Hamano
Merge bran
c
h 'po
/
user
d
iff-csharp'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Hamano
Merge branch
'
ab
/
perl-ins
t
al
l
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merg
e
bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-08-22
Jen
s
Lehmann
t7403: add mis
s
in
g
&
&
'
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mark Rada
T
e
ll ignor
e
file about g
e
nerate
files in /gitweb/static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
J
unio C
Hama
n
o
M
e
r
g
e branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
amano
Me
r
g
e
branch 'jc/maint-follow-rename
-
fix' i
n
to maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hama
n
o
Merge branc
h
'
jn/
m
aint-plug-leak
'
into m
a
int
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge bran
c
h
'jn/fix
-
abbrev' into m
a
int
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
Hamano
Merge branc
h
'
vs/do
c
-spell'
into maint
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio
C Ham
a
no
Merg
e
branch
'
jn/r
e
base-rename
-
a
m
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
H
ama
n
o
M
e
rge branch 'jn/doc-pull'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2010-08-20
Juni
o
C
H
am
a
n
o
Merge
b
r
a
n
ch 'bc/use-more-hardlinks-in-install' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C H
a
mano
Merge branch
'
tr/rfc-re
s
e
t
-doc' into mai
n
t
commit
|
commitdiff
|
tree
2010-08-20
Ramku
m
ar R
a
machandra
buil
t
in/
c
h
e
ckout: Fix messa
g
e when switching to
an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu Moy
xmallo
c
: include
s
ize in the fail
u
r
e me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
J
u
nio C Ham
a
no
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
J
u
ni
o
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 branch 'tr/xsi
z
e-bits' i
n
to
m
aint
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Merge
br
a
nch 'jc/sh
a
1-name
-
find-
f
ix' into maint
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
Merg
e
branch 'sp/fix-smart-http-deadlock-on-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Junio
C Hamano
Merge branch 'jc/
m
aint-follow-rename-fi
x
'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C Hamano
Merge branch 'tf
/
stri
n
g-list-init'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
i
o
C Hamano
Merge bra
n
ch
'cc
/
f
i
nd-co
m
mit
-
s
ub
j
ec
t
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge b
r
anch 'jn
/
m
a
int-
p
l
u
g-leak'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C Hamano
M
erge branch 'jl/su
b
module-ignore-diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Ha
m
ano
Merge branch 'ml/rebase-x-strategy'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
io C Hamano
M
e
rge b
r
anch 'jn/fix
-
abbre
v
'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o
C Ham
a
n
o
M
e
rge br
a
nch 'vs/doc-spell'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
M
e
rge bran
c
h 'jh/use-te
s
t-must-fail
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
M
erge branch 'j
h
/clea
n
-e
x
clude
'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C
Hamano
M
erge
b
r
anch
'
kf/post
-
r
eceive-sample-h
o
ok'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
i
o
C H
a
mano
Merge branch 'ab/report-
c
or
r
upt-object-w
i
th-type'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge b
r
an
c
h 'jn/
r
ebase-rename-am'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Haman
o
Merge branch 'jn/fast-import-subtree'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C Haman
o
Merge br
a
nch 'ar/string-list-for
e
ach'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
am
a
n
o
M
erge bran
c
h 'jh/graph-n
e
xt-lin
e
'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C Hamano
M
erge branch 'tr/xs
i
ze-bits'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
Me
r
ge branch
'
t
c
/checkou
t
-B
'
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
A
gu
i
lar
me
r
getool:
Skip
autoresolved
pa
t
hs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Petr Onderka
U
serdiff p
a
tterns for
C
#
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Æ
v
ar Arnfjörð B
j
armason
log: test for regress
i
on introduced in v1
.
7
.
2-rc0~103^2~2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
diff --follow: do call diff
c
ore
_
std() a
s
necess
a
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
J
unio C
H
amano
dif
f
-
-
f
ol
l
ow: do not waste
c
ycles while r
e
cursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Ævar Arnfjö
r
ð
Bja
r
mas
o
n
pe
r
l/Makefile: U
n
set INSTALL_BA
S
E when m
a
king perl
.
mak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
E
l
ijah Newren
pull --
r
ebase: Avoid spurious c
o
nf
l
icts
a
nd reapplying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
El
i
jah Newren
t
5
5
2
0-pul
l
: Add
testcases showing spurious
c
on
f
licts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ham
a
no
Mer
g
e branc
h
'jc/sha1-n
a
me-find-fix'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ham
a
no
Merg
e
branch 'jn
/
doc-pull'
commit
|
commitdiff
|
tree
2010-08-13
Jun
i
o C
H
amano
Merge branc
h
'
j
n
/maint-git
w
eb-dynconf'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branc
h
'bc/use-more-hardlinks-in-install
'
commit
|
commitdiff
|
tree
2010-08-13
Junio C
H
amano
Merge
b
ran
c
h 'tr/rfc
-
rese
t
-doc'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
i
o
C Ham
a
no
M
e
rge b
r
anch 'jn/
p
ars
e
-d
a
te-bas
i
c'
commit
|
commitdiff
|
tree
2010-08-13
Junio
C
Hamano
M
e
rg
e
b
ranch 'sp/fix-smart-http-dead
l
ock-o
n
-er
r
or'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ham
a
n
o
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-08-13
Mat
t
hieu Moy
push:
ment
i
on "
g
it pull" in error m
e
s
sa
g
e fo
r
non
-
fast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
J
onathan Nieder
Stand
a
rd
i
ze do {
.
.
.
} whil
e
(0) style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
B
r
andon Case
y
t/t7003: rep
l
ace
\t with literal tab in sed
e
xpression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Nelson El
h
age
i
n
d
ex
-
pack: Don't follow
r
eplace refs
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Junio C Hamano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-08-11
Matt
h
ie
u
M
o
y
post-receive-em
a
i
l: remo
v
e spurious commas in email
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Raja R Hari
n
ath
fast-im
p
ort: expor
t
cor
r
e
ctly marks larger than 2^20-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Ævar Arn
f
jörð Bja
r
mason
t/lib-git-svn
.
sh: use $P
E
RL_PATH for perl, not p
e
rl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
D
i
ane G
a
sselin
t7609: te
s
t merge
a
nd
checkou
t
erro
r
mess
a
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matt
h
ieu
M
oy
unpack
_
trees
:
g
roup error message
s
by type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
M
a
tt
h
ieu Moy
merge-recu
r
s
i
ve: distingu
i
sh "removed" and "ove
r
written
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Diane
Gasseli
n
mer
g
e
-
recursive: por
c
elain messag
e
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
Matthieu Moy
Turn unpack_trees_options
.
msgs into an
array + enum
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
wr
i
te
-
tree:
A
void l
e
ak 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 Nied
e
r
read-tree: stop leakin
g
tree o
b
jec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nie
d
er
cor
e
: Stop leaking
o
ndis
k
_ca
c
he_
e
nt
r
ys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jakub N
a
re
b
s
ki
diff: strip extr
a
"/" when
s
t
ripping prefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
git
w
eb: clarify s
e
arch results page
w
h
e
n n
o
matching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
T
a
y R
a
y Chuan
built
i
n/check
o
ut:
h
andl
e
-B from de
t
ached HE
A
D correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Docu
m
e
n
t
ation: ad
d
a FILES section
for
show-ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonatha
n
Niede
r
M
a
ke
f
ile: add
missing dependenc
y
on http
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan N
i
e
d
er
Ma
k
e
fil
e
: add miss
i
n
g
d
e
p
endencies on url
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Michael J
G
ruber
Documentation/git-l
o
g: Clarify --full-diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Willy Tarreau
g
i
t-reba
s
e: fix typo when parsing
-
-f
o
rce-rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ævar Arnfjörð Bjarmason
imap-send:
Fi
x
sprintf usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
p
r
une: allow --dry
-
run
f
or -n and --verbose fo
r
-v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Re
n
é
Scharfe
notes: all
o
w --dry-run f
o
r -n and --ver
b
ose for -v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Juni
o
C Hamano
Merge branch 'web
r
ick'
of git
:
//git
.
bogomips
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2010-08-09
Ma
t
t
h
ieu Moy
D
o
cume
n
t
-
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
B
r
ad King
Doc
u
mentation: cite
git-am from
g
i
t-app
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Thomas Rast
t70
0
3: f
i
x subdirectory
-
f
ilt
e
r test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jen
s
Lehmann
Add tests
f
or the dif
f
.
ign
o
reSubmodu
l
es config option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Johannes Schindelin
Ad
d
the 'diff
.
igno
r
e
S
ubmodules' config set
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jens Le
h
m
a
n
n
S
ub
m
o
du
l
e
s
:
U
se "ignore
"
sett
i
ngs fro
m
.
g
itmodules
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
Submodules: Add the new
"
ignore" c
o
n
fig option f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Shawn O
.
Pear
c
e
sm
a
rt-http: Don't deadlock on ser
v
er failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
er
Allow "
c
he
c
k-ref-format
-
-branch"
f
rom subd
i
rector
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nied
e
r
chec
k
-ref-format: handle subcommands in separate functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Juni
o
C Hamano
Merge
g
it:
/
/git
.
bogomip
s
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2010-08-05
Mat
t
h
i
eu M
o
y
p
r
etty-opti
o
ns
.
tx
t
:
m
atch --f
o
rmat's
d
ocumentation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merg
e
bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
next