repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make test case numbers unique
2010-01-21
Jo
h
an
n
es Sixt
M
a
k
e
test case
n
umbers
u
nique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o
C Hamano
con
f
lict-marker-size: a
d
d
test and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hama
n
o
Update draft
release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge branch 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C Hamano
Merge branch 'jc/che
c
kout-me
r
g
e
-
b
ase'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
amano
Merge
branch 'ag/pa
t
ch-
h
eader-veri
f
y'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
ch 'jc/
c
onflict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge branch
'
ag/main
t
-apply
-
too-large-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge branch 'ap/merg
e
-backend-opt
s
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Me
r
ge br
a
nc
h
'nd/status
-
partial-refres
h
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e
r
emote
branch 'remote
s
/trast
-
doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge b
r
anch
'jh/notes' (early pa
r
t
)
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Ha
m
ano
Merge br
a
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
Hamano
Merge br
a
nch 'jc/maint-refresh-index-is-opt
i
onal-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge b
r
anch 'r
r
/core-tutor
i
al'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
M
e
rge branch '
j
c/
c
ache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch 'js/e
x
ec-err
o
r
-
r
eport'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge bran
c
h 'j
c
/
l
s-file
s
-ignor
e
d
-
pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
Merg
e
br
a
n
ch 'jc/grep-l
o
ok
a
head'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
no
Merge b
r
anch 'jc/
m
aint-s
t
rbuf
-
add-fix-dou
b
ling
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
Merge b
r
a
n
c
h 'mm/con
f
l
i
ct-adv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e
b
ranc
h
'da/difftoo
l
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hamano
Merge bra
n
ch
'
mh/rebase-fixup
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'ns/rebase-auto
-
s
q
u
ash
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
M
e
rge bra
n
c
h
'mh/
r
eba
s
e-fixup' (
e
arly part)
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge branch
'il/p
u
sh-set-upstre
a
m'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branc
h
'jk
/
warn-author
-
com
m
itter-after-co
m
mit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge
b
r
anch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
rge b
r
a
n
ch 'tr/h
t
tp-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch 'bk/fix-rela
t
i
ve
-
gitdir-
f
ile
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sd
/
cd-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
ama
n
o
Merge
b
r
a
nch 'jc/symbo
l
-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
date
.
c: mark
fil
e
-local
function
stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
S
y
nc
w
ith
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
am
a
no
Mer
g
e br
a
n
ch 'bg/maint-remote-upda
t
e-def
a
u
lt
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hama
n
o
Merge
b
ranch '
s
b/
m
aint-octopus' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
erge branch 'bg/ma
i
nt-add-a
l
l-doc
'
into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge
b
r
anch 'maint-1
.
6
.
5'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
mano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Mer
g
e branch 'jk
/
maint-1
.
6
.
5-
r
e
s
et-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge br
a
n
ch 'tr/maint-1
.
6
.
5-b
a
sh-prom
p
t
-
show-s
u
bmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'dp/m
a
int-1
.
6
.
5-fas
t
-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Merge branch 'jm/maint-1
.
6
.
5
-
g
re
p
-NUL-t
e
rm
i
nat
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "checko
u
t A
.
.
.
"
sy
n
onym
f
or "check
o
ut
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
ama
n
o
status: don't re
q
uir
e
the
r
epos
i
t
o
ry to be writ
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
oha
n
nes
Six
t
Mak
e
fil
e
: honor NO_CURL when setting REMOTE_CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
T
armi
g
an C
a
se
b
olt
iden
t
.
c: replace f
p
rintf with fputs
t
o sup
p
r
e
ss compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn T
h
ái N
g
ọc Duy
r
m
: only re
f
r
e
sh entries that we may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
bisec
t
: fix si
n
gular/
p
lural g
r
ammar nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport: s
t
an
d
arize sys
t
em()
c
a
l
ls to
exte
r
nal g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsim
p
ort: st
a
ndarize o
p
en() calls to external
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
en
W
a
lton
cvsimport:
m
odernize callouts
to git subcommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
Hamano
M
e
rge branch 'main
t
-1
.
6
.
4'
into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge br
a
nch 'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
M
e
rge bra
n
c
h 'maint-1
.
6
.
2'
i
nto maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
M
erge commit 'v1
.
6
.
4
.
4-8-g8
d
e
6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Fix mis-b
a
ckpo
r
t
of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Update dr
a
ft rele
a
se notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Mer
g
e bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update dra
f
t release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge bra
n
ch 'dp/maint-1
.
6
.
5-fast-im
p
ort
-
non-c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
Hamano
Merge branch '
p
c/uninter
e
sting-submodule-d
i
sappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Me
r
ge branch '
n
d
/
include-termios-for-oso
l
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge branc
h
'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andr
e
a
s
Gru
e
n
b
acher
builtin-apply
.
c: fix the --- and ++
+
header filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Barka
l
ow
Re
p
lace par
s
e
_
blob() with an explanatory com
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge br
a
nc
h
'jm/maint-1
.
6
.
5-grep-NUL-te
r
minate' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim M
e
yering
grep: NU
L
terminate in
p
ut from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
n
dre
a
s Gr
u
en
b
a
c
her
builti
n
-apply
.
c
: Skip fil
e
names
w
it
h
out enough c
o
mpo
n
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c:
r
e
m
o
ve un
u
se
d
functi
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
aman
o
object
.
c
: remove unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
D
o
cument th
a
t merge s
t
rateg
i
e
s c
a
n
n
o
w ta
k
e their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
v
ery Pennarun
Exten
d
mer
g
e-subt
r
ee tests to
test -Xsubtree=d
i
r
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Ham
a
no
M
a
k
e
"s
u
btree" part more orthogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
un
i
o C Ha
m
an
o
pull: Fix parsin
g
of -X<opt
i
o
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennaru
n
Tea
c
h git-pul
l
t
o
p
a
ss
-
X<option>
to gi
t
-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
git merge -X<op
t
io
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
ni
o
C
H
amano
Update draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'tc/test-loca
t
e-http
d
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Merge
b
r
a
nch 'jh/comm
i
t-status'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch 'jn
/
makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
a
n
o
Mer
g
e branch 'jc/ma
i
nt-1
.
6
.
1
-
c
h
ec
k
out
-
m-c
u
stom-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge bra
n
ch 'tc/clone
-
v-prog
r
ess'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ham
a
no
Merge branch
'tc/smart-http-r
e
st
r
i
ct'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
Merge
b
ranch 'jk/
r
un-comm
a
nd-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge branc
h
'sr/gfi-op
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update COPYIN
G
with GPLv2 with new FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
user
_
ident_sufficiently_given(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_id
e
nt_suffic
i
ently_given(): refa
c
tor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: honor
conflict-marker-
s
ize at
t
ribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
rere
r
e: pre
p
are for cu
s
tomizable con
f
lict mark
e
r len
g
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
m
a
n
o
com
m
it
.
c::print_summa
r
y: do
no
t
releas
e
the forma
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
co
n
f
l
ict-ma
r
ker-size: new
a
ttribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ham
a
no
rerere: us
e
ll_
m
erge
(
) inst
e
ad of us
i
ng xd
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
amano
merg
e
-tree: use ll_merge() not xd
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
x
dl_merge(): allow
pass
i
ng
down m
a
rker_size in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
xdl_merge():
i
n
tro
d
u
c
e
x
m
param
_
t
f
or
merge
s
pecific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next