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
Junio C Hama
n
o
Merge
branch '
h
v
/submodule-find-ff-
m
erge
'
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io
C Hamano
Merge
bran
c
h
'
e
n
/rebase-against-rebase-fix
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Mer
g
e branc
h
'dg/local-mod-
e
rror-m
e
s
sages'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Mer
g
e branch 'po/userdiff-csharp'
commit
|
commitdiff
|
tree
2010-08-22
J
u
ni
o
C Hamano
Merge branc
h
'ab/pe
r
l-in
s
tall'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
Hamano
Me
r
ge bran
c
h 'mai
n
t'
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
Mark Rada
Tell ignore file about gene
r
at
e
f
iles
i
n
/
git
w
e
b
/static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ha
m
ano
M
e
rge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
Ha
m
a
n
o
Merge branch 'jc/main
t
-
follow-rename-fix' into
m
ain
t
commit
|
commitdiff
|
tree
2010-08-20
Junio C
Hamano
M
e
rge branch 'jn/maint
-
plug-leak' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C H
a
m
ano
Merge branc
h
'jn/fix-ab
b
r
e
v' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ha
m
ano
M
erge branch
'vs/doc
-
spell' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C
Hamano
Merge
b
ranch 'jn/rebas
e
-re
n
ame-am' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio
C
Hamano
M
erge branch 'jn/doc-pu
l
l' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
M
erge bra
n
c
h 'bc
/
u
s
e-more-hardlinks-in-install' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 't
r
/rfc-reset-
d
o
c
' in
t
o maint
commit
|
commitdiff
|
tree
2010-08-20
Ramku
m
ar
R
amachandra
bu
i
lt
i
n
/
checkout: Fix message when switchin
g
to an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu Moy
xmalloc: include s
i
ze in
the f
a
ilure
m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio
C
Hama
n
o
M
e
rge branch 'ma
i
nt' to sync
w
i
t
h 1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C
Haman
o
Gi
t
1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
J
u
nio
C Ha
m
ano
M
erge b
r
anch 'tr/xsize-bi
t
s' into maint
commit
|
commitdiff
|
tree
2010-08-19
Junio
C
Hamano
Merge branch 'jc/
s
ha
1
-name-find-fix'
i
nt
o
maint
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
Merge branch 'sp/fix-
s
mart-
h
t
t
p
-deadlock-
o
n-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
Merge
bra
n
ch 'jc
/
m
a
i
n
t-f
o
llow-rena
m
e-fix'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Hamano
Merge br
a
n
c
h 'tf/string-list-in
i
t'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
am
a
no
Merg
e
b
ranch 'cc/find-commit-subj
e
ct'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C Hamano
Merge branch '
j
n/maint-plug-lea
k
'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Ha
m
ano
Me
r
g
e branc
h
'jl
/
submodule-ignore
-
diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C Haman
o
Me
r
ge br
a
nch 'ml/rebase-x-str
a
te
g
y'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merg
e
br
a
nch
'
jn
/
fix
-
ab
b
r
e
v'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
H
amano
Merge
b
ranc
h
'vs/doc-spell'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
ano
Merge branch 'jh/use-
t
e
st-
m
ust
-
fa
i
l'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio
C
Hamano
Merge branc
h
'jh/cle
a
n-
e
xclude'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Ha
m
ano
Merge branc
h
'kf/post-
r
ec
e
ive-samp
l
e-h
o
ok'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C Hamano
Merge branch 'ab/rep
o
rt-
c
orrupt-o
b
j
e
ct-with-
t
ype'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
amano
Merge branch 'jn/reb
a
se-rename-am'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
am
a
n
o
Merge branch
'
jn/fast-import-subtree'
commit
|
commitdiff
|
tree
2010-08-18
Junio C H
a
mano
Merge branch 'ar/
s
t
r
ing-l
i
st-foreac
h
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jh/graph
-
next-l
i
ne'
commit
|
commitdiff
|
tree
2010-08-18
J
uni
o
C Hamano
Merge b
r
anch 'tr/xsi
z
e
-bit
s
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
Hama
n
o
M
erge bra
n
ch 'tc/chec
k
out-
B
'
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
e
r
g
etoo
l
: Skip
autores
o
lved pa
t
hs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-17
Petr Onderka
Userdiff patterns for
C
#
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Ævar Ar
n
fjörð Bjarmason
log: test for regre
s
sion
i
n
trod
u
c
ed 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
H
a
mano
d
i
ff --f
o
llo
w
: do
call diffcore_std() as necess
a
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ha
m
ano
diff --follow: do not waste
cycles while
recursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Æ
v
a
r Arnfjörð
Bjarmas
o
n
perl/Makef
i
le: Unset INSTA
L
L_BASE
when makin
g
perl
.
mak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Eli
j
ah Newren
pull --re
b
ase
:
Avoid spu
r
iou
s
conflicts and reappl
y
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t
5520
-
pull
:
Add te
s
tcas
e
s sho
w
in
g
spurious con
f
licts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
M
e
rge branch 'jc/sha1-name
-
find-fix
'
commit
|
commitdiff
|
tree
2010-08-13
Junio C H
a
mano
Merg
e
branch
'
jn/doc
-
pull'
commit
|
commitdiff
|
tree
2010-08-13
J
uni
o
C
H
amano
Merge
branch
'jn/
m
a
i
n
t
-
gitweb-dynconf'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ha
m
ano
Merge bra
n
ch 'bc/use-more-hardlinks-in-install'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
M
e
r
ge branch 'tr/rfc-r
e
s
e
t-
d
oc
'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ham
a
n
o
Merge branch
'jn
/
par
s
e-date-basi
c
'
commit
|
commitdiff
|
tree
2010-08-13
J
unio C Ha
m
ano
Merge branch 's
p
/fix-smart-ht
t
p
-deadlock-on-e
r
ror'
commit
|
commitdiff
|
tree
2010-08-13
Junio C
H
a
mano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-08-13
Matthieu Moy
p
us
h
: m
e
ntion "git pull" in error messa
g
e
for non-f
a
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Jonathan
Nieder
Standard
i
ze do {
.
.
.
} w
h
ile (0
)
s
tyle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Brandon Casey
t
/
t
7003: repl
a
ce \t with lit
e
r
al
t
ab
i
n sed expre
s
sio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Nelson
E
lh
a
ge
index-pack: Don't foll
o
w replace refs
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
J
u
nio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-11
Matthie
u
Mo
y
post
-
receive-email:
r
e
m
ove
spurious
commas in em
a
i
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
R
a
ja R Harinath
fast-im
p
o
rt: export co
r
rectly
marks larg
e
r tha
n
2^2
0
-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Æ
v
ar Arn
f
jörð Bjarma
s
on
t
/
l
i
b-git
-
svn
.
s
h
: use $PERL_PATH
fo
r
perl, not perl
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Diane Gasselin
t7609: test merge
a
nd che
c
ko
u
t err
o
r messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu
M
o
y
unpack_trees: group
e
rror
messages by type
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Matt
h
ieu Moy
merge-rec
u
rsiv
e
: distingu
i
s
h
"removed"
and
"overwritten
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
D
i
ane Gasseli
n
merge-recursive
:
porcelain messages for chec
k
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
T
u
rn unp
a
ck_trees_opt
i
ons
.
msgs
into an array + enum
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan N
i
eder
write-tree: A
v
oid leak whe
n
ind
e
x refers
to an i
n
valid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Ni
e
der
r
ead-t
r
ee: stop leaking tree objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
J
ona
t
han
Nieder
core: Stop
leaking ondisk_
c
a
c
h
e_entrys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jaku
b
N
a
rebski
diff: str
i
p extra
"/"
w
hen strippin
g
prefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Junio C Hama
n
o
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-08-09
Jona
t
han Nieder
g
i
tweb
:
clarify search re
s
ults page w
h
en
n
o matching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Tay R
a
y Chuan
bui
l
t
i
n/checkout:
h
andle -B f
r
om
d
etac
h
ed HEAD correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Niede
r
Documentatio
n
: add a
FILES
s
ection for
s
h
ow-ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nied
e
r
Ma
k
efile: add
missing
dependenc
y
on
http
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan
N
ieder
Ma
k
e
f
ile:
a
dd missing dependencies on url
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Michael J Gruber
Do
c
ument
a
tion/git-
l
o
g: Clarify -
-
full-d
i
ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
W
illy Tarreau
git-re
b
ase: fix typo when parsin
g
-
-fo
r
ce-
r
ebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Ævar Arnfjörð
B
j
ar
m
ason
i
map-send: Fix sprintf usa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
prun
e
:
a
llow -
-
dry
-
run f
o
r -n
a
nd --verbose for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
R
e
né Scharfe
notes: al
l
ow
--dry-run for -n and --v
e
r
bose f
o
r -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
J
u
nio C H
a
mano
Merge branch 'webrick' of git:/
/
git
.
bogomips
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2010-08-09
Matthie
u
Moy
Document -B<n>[/<m>], -M<n> and
-C<n> v
a
r
ian
t
s
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Brad King
D
oc
u
m
e
n
tation: cite gi
t
-am from git-apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
T
h
om
a
s Rast
t
7
0
03: fix subdirecto
r
y-filter
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
J
ens
Lehman
n
Ad
d
tests for
t
he diff
.
ignoreSubmodul
e
s co
n
fig option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Johannes Schindelin
Add the 'd
i
ff
.
i
g
noreSubmodu
l
es' co
n
fig settin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
J
ens L
e
h
mann
S
u
b
modules: Use
"ignore"
settings from
.
gitmodules
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehman
n
Submodules: Add the new "ignore" config opt
i
on f
o
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Shawn O
.
P
e
a
r
c
e
s
m
art-http: Don't deadloc
k
on server failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nieder
Allow "check-ref-format --b
r
anch" from subdirectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nieder
che
c
k-r
e
f-forma
t
: handle subco
m
mands in
s
e
parate fun
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
uni
o
C
H
am
a
no
Merge git://git
.
bogomips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2010-08-05
M
a
t
t
h
i
eu
Moy
prett
y
-options
.
txt: matc
h
--form
a
t
's documentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
next