repo.or.cz
/
alt-git.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
Make tes
t
case numbers unique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ham
a
no
c
o
nflict-
m
arker-size: add test a
n
d docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o
C Hamano
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 Ha
m
ano
Merge branch 'bw/cvsimpo
r
t'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C
Hamano
Mer
g
e
b
r
anc
h
'jc/ch
e
ckout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
ama
n
o
Merge b
r
a
nch 'a
g
/
p
atch-h
e
ader-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge branc
h
'jc/conf
l
ict-marker-siz
e
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge bran
c
h 'ag/ma
i
nt
-
apply-too-larg
e
-p
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ha
m
a
no
Merge branch '
a
p/
m
erge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge branch 'nd/status
-
partial-refr
e
sh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge
r
emote branch 'remotes/trast-
d
oc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C Hama
n
o
Merge branch 'jh/
n
otes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Haman
o
Merge branch 'jc
/
m
aint-refresh-i
n
dex-
i
s-op
t
ion
a
l-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'r
r
/co
r
e-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge
b
ranch 'jc/cac
h
e-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merg
e
branch 'js/exe
c
-
e
rror-
r
eport'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
M
e
r
ge branch 'jc/ls-f
i
le
s
-
i
gnored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge bra
n
ch 'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
erge branch
'jc/
m
aint-strbuf-add-fix-d
o
ubling'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Hamano
Merge bran
c
h 'mm/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
e
rg
e
branch
'
d
a/diffto
o
l'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge
b
ra
n
ch 'mh/reb
a
se
-
fixup'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rg
e
branch 'ns
/
reb
a
se-a
u
to-squash'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
H
amano
Merge br
a
n
ch
'mh/
r
ebase
-
fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch 'il/
p
ush-s
e
t-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
a
n
o
Merge branch '
j
k/warn-autho
r
-committ
e
r-after
-
co
m
mi
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branc
h
'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merg
e
branch
'tr/
h
tt
p
-pu
s
h-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
br
a
nch 'bk/fix-relati
v
e
-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge b
r
anch 's
d
/c
d
-p-
s
how-to
p
le
v
el'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
erge branch
'
jc/symbol-stati
c
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
date
.
c: m
a
rk file-
l
o
cal function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
ma
n
o
S
ync
with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Haman
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'bg/mai
n
t
-
r
emo
t
e
-
u
p
dat
e
-defaul
t
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'sb/maint-o
c
topu
s
' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
er
g
e branch 'bg/mai
n
t-
a
d
d-
a
ll-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'main
t
-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Merge branc
h
'jk/
m
aint-1
.
6
.
5
-
r
e
s
et-har
d
' i
n
to mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Me
r
ge branch
'
tr/maint-1
.
6
.
5-bash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branc
h
'd
p
/maint-
1
.
6
.
5-fast-im
p
ort-no
n
-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C
Hamano
Me
r
g
e
branch '
j
m/maint-1
.
6
.
5-grep-NUL-te
r
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
Fix
"checkout A
.
.
.
" synonym for "checko
u
t A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
s
tatus: don't require the repos
i
tory to be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
M
akefile: honor
NO
_
CURL whe
n
s
etting
R
EMOTE_
C
URL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Casebol
t
i
d
e
n
t
.
c: r
e
pl
a
ce fprint
f
w
i
th
f
puts
t
o
s
uppres
s
compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ng
u
y
ễn
T
hái
N
gọc Duy
rm: only r
e
f
resh entries that we may to
u
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
David Ri
p
ton
bisect:
fix sin
g
ula
r
/pl
u
r
al gra
m
mar nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben
W
alton
cv
s
impor
t
: s
t
andarize
s
yst
e
m() calls to extern
a
l git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cv
s
imp
o
rt:
stand
a
rize open(
)
calls to externa
l
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
en Walt
o
n
cvsimport: modernize callout
s
t
o
git su
b
commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Me
r
ge
branch 'maint-1
.
6
.
4' into m
a
int-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
no
Merge branch 'maint-1
.
6
.
3' into mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
amano
Merg
e
bra
n
ch 'maint-
1
.
6
.
2' into
m
aint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge commit 'v1
.
6
.
4
.
4-8-g8de6518' into maint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Haman
o
Fi
x
mis-backport of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update draft release note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Update d
r
af
t
rel
e
ase n
o
t
e
s t
o
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C H
a
mano
Merge branch 'dp
/
main
t
-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'jc/re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge br
a
nch
'
pc/
u
ninteresti
n
g
-
s
ubmodule
-
disa
p
p
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge bra
n
c
h 'nd/include-termi
o
s-for-os
o
l'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge bran
c
h
'js/w
i
ndows'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gruenb
a
cher
builtin-apply
.
c:
fix the --- and +++ head
e
r filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
a
niel
Barka
l
ow
Replace par
s
e_blob() with an explanatory comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'jm/maint-
1
.
6
.
5-g
r
ep-NUL-terminat
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim
Meyering
gre
p
:
NUL
termin
a
te input from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andre
a
s Gruenbacher
builtin-a
p
ply
.
c
:
S
k
ip filenames
w
ithout enou
g
h components
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio
C
H
amano
s
y
mlinks
.
c: remove un
u
s
e
d
func
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Ham
a
no
object
.
c: remove unused func
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
amano
Docu
m
ent that mer
g
e
s
t
r
ategies
can now take their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Av
e
r
y
P
e
n
narun
Ex
t
end me
r
ge-subtree tests to test
-
X
subtree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make
"
s
u
b
t
ree" part more orthogonal to t
h
e rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull:
F
ix
p
a
rsing of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
v
er
y
Pennarun
T
e
ach git-pull
t
o pass
-
X<option> to
g
it-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
g
it merge -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Update draft
releas
e
notes
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
Merge bra
n
ch '
t
c/test-
l
ocate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge b
r
anch 'jh/co
m
mi
t
-status'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C H
a
mano
Merge br
a
n
ch
'
jn/mak
e
file'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
M
e
r
ge
bra
n
ch 'jc
/
maint-1
.
6
.
1
-
c
heckout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C Hamano
Me
r
ge branc
h
'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merge branch
'
tc/smart-http-res
t
r
i
c
t'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Haman
o
Merge branch
'
jk/run-comman
d
-use
-
shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merg
e
branch 'sr/gfi
-
o
ptions'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Update
C
O
P
YING with GPL
v
2 w
i
th new F
S
F add
r
e
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
H
a
mano
user_ide
n
t_sufficiently_
g
iven():
r
ef
a
c
t
or the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C Hamano
user
_
ident_suffi
c
i
e
ntly_give
n
()
:
r
e
fact
o
r the
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
rerere: honor conflict-mark
e
r-siz
e
attri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
rerere:
p
rep
a
re fo
r
cust
o
m
iz
a
ble
c
onflict marker le
n
gth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ha
m
ano
c
o
mmit
.
c::
p
rint_summary: do not releas
e
th
e
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C
Hamano
con
f
lict
-
marke
r
-size: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
rer
e
re: use ll_merge() instead of u
s
ing xdl_m
e
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tree:
u
se ll_merge(
)
n
o
t
xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ham
a
n
o
xdl_merge(): allow passing down mark
e
r_size in xmpara
m
_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge():
i
ntroduce xmparam_t f
o
r
merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next