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
Merge branch 'pt/pull-ff-vs-merge-ff'
2015-05-26
Junio
C
H
amano
Merg
e
branc
h
'
p
t/pull-f
f
-vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merge b
r
anch 'pt/pull-log-
n
'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merge
b
ranch 'jk/r
e
rer
e
-forget
-
c
heck-enabled'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Fourth batch for 2
.
5 c
y
cl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-22
Junio C H
a
mano
M
erge bra
n
ch 'ps/doc-pack
f
i
le-vs-pac
k
-file
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Hamano
Merge branch 'sb/t1020-cleanup'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o C Hamano
Merge branch 'lm/squelch-b
g
-progress'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Hamano
Merge branch 'jc/
i
g
no
r
e-e
p
ipe
-
in-filter'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Ha
m
ano
Me
r
ge branch 'mh/clo
n
e
-
ver
b
osity-fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Ham
a
no
Merge bran
c
h 'pt/p
u
ll-t
a
gs-error-
d
i
a
g'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C Hamano
Merge branch 'mh/lockfile-ret
r
y'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Hamano
M
e
rge
b
ranc
h
'jk/add-
e
-kill-editor'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Hamano
Mer
g
e branch 'sg/
c
ompl
e
tio
n
-config'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hama
n
o
Merg
e
branch
'mh/ref-directory-f
i
le'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C
Hamano
Merge branch
'
mh/write-refs-s
o
o
n
er
-
2
.
4'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Ha
m
ano
Mer
g
e branch 'mg
/
log-deco
r
ate-HEAD'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Haman
o
Me
r
ge branc
h
'jk
/
a
s
c
ii
d
oc-ma
r
kup-fi
x
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Hamano
Merge branch 'jk/str
i
pspace-asciidoctor-fix
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge
branch 'ja/
t
ut
o
ria
l
-asci
i
doctor-fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Ham
a
no
M
e
r
ge branch 'sg/
h
elp
-
s
u
bcommands'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
M
e
rge bra
n
ch 'ps/bundl
e
-
v
e
r
i
fy-arg'
commit
|
commitdiff
|
tree
2015-05-22
J
uni
o
C Hamano
Mer
g
e
bra
n
ch
'l
s
/h
t
tp-ssl-cipher-list'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C Ham
a
no
M
e
r
ge branc
h
'
dl/su
b
t
r
ee-avoid-
t
ricky-echo
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch 'jk/skip-http-tests-under-no-cur
l
'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
Merge bra
n
ch 'dl/subtree-push
-
no-squash'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o C
H
amano
Merge
b
ranch 's
g
/co
m
p
letion-o
m
it-
c
redent
i
al-helper
s
'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Ham
a
no
Merge branch 'dl/branch-error-messa
g
e'
commit
|
commitdiff
|
tree
2015-05-22
Pa
t
ric
k
Steinhardt
doc: f
i
x inconsisten
t
spelling of "pac
k
file"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Junio C
Ham
a
n
o
filter_b
u
f
fer
_
or_fd(): ignor
e
EPIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
co
p
y
.
c: make
c
o
py_fd() report i
t
s status si
l
ently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
T
hi
r
d
batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o
C Ham
a
no
Merge branch 'sb/ref
-
l
o
ck-lose-lock-fd'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hamano
Me
r
ge branch 'kn/cat-fil
e
-literal
l
y
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
Merge br
a
nc
h
'nd/dwim-
w
il
d
cards-as
-
path
s
p
e
cs
'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C
H
amano
Merge branch 'jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ham
a
n
o
Merge branch 'ph
/
rebase-i-r
e
d
o
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge
branch 'jc/test-prereq-validate
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
Merge
b
r
a
nch 'bc/connect-plin
k
'
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
io C Hama
n
o
Me
r
g
e
branch 'j
k
/test-chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
Mer
g
e bra
n
ch 'fg/document-co
m
mit-message-stripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
H
a
mano
Mer
g
e bra
n
c
h
'jk/sta
s
h-re
q
uire-clean-i
n
dex'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
M
e
rge bra
n
c
h
'jk/
g
it-no-more-argv0-path
-
mungin
g
'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io
C
H
a
mano
Mer
g
e
b
ranch 'jc/gitig
n
o
r
e-precedence
'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C
H
amano
Merg
e
br
a
nch 'nd/diff-i-t-a'
commit
|
commitdiff
|
tree
2015-05-19
J
eff K
i
ng
progress:
trea
t
"no termi
n
al
"
as being in the fore
g
round
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Mike Hommey
clone: c
a
ll transpor
t
_s
e
t_verb
o
sity
b
e
f
ore
a
n
yth
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Stef
a
n Beller
subdirectory tests:
c
ode cleanu
p
, uncomment
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
P
a
ul Tan
pull: parse pull
.
f
f
as a
boo
l
or string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: ma
k
e pull
.
ff=tru
e
override merge
.
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: ha
n
dle --lo
g
=<n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patr
i
ck Stei
n
hardt
pack-pr
o
to
c
ol
.
txt
:
fix insconsistent spelling of
"
packfi
l
e"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patrick Steinhardt
g
it
-
unp
a
ck-objects
.
txt: fix
inconsistent
spe
l
lin
g
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Pa
t
rick Steinhardt
git-
v
erify-pa
c
k
.
t
x
t: fix
inco
n
sistent spelling of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Mich
a
el Haggerty
l
ock_
p
a
c
ked_
r
efs(): allow retrie
s
wh
e
n ac
q
uirin
g
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
M
ichael Hagge
r
ty
l
o
c
k
file
:
all
o
w
f
i
le l
o
cking to b
e
retried
w
ith a timeout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
r
erere:
e
xit silently on "
f
or
g
e
t
" when rerere is disabl
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul Tan
p
u
ll: remove --tags er
r
or in no merge candidates case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
J
eff King
doc: conve
r
t AsciiDoc {
?
foo}
to if
d
ef::foo
[
]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Sync wi
t
h 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
J
u
ni
o
C Hamano
G
i
t
2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Me
r
ge branch
'
s
b
/line-log-plug-pairdiff-leak'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
M
erg
e
bran
c
h
'
s
b/test-
b
itm
a
p-free-at-end' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Ham
a
no
Merg
e
branch 'n
d
/t1509-
c
h
root-test' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
ma
n
o
Merge
bra
n
ch 'jk/type
-
from-s
t
r
i
ng-gently' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
ano
Merge b
r
anch 'ep/f
i
x-tes
t
-
l
i
b-fu
n
cti
o
ns-
r
eport' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
Merge
b
ranch 'cn/bom-in-gitignore'
into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Ham
a
n
o
M
e
rge
branch 'jk/prune-mtime' into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
mano
Merge branch 'jk/init-cor
e
-
wo
r
ktree-at-root' i
n
to
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hama
n
o
log: do n
o
t s
h
orten decoration names too ea
r
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
log: d
e
cor
a
te HEAD with branch
name
und
e
r --decora
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff
K
i
n
g
d
oc: put
e
xample URLs and
emails i
n
side lite
r
al ba
c
kticks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff K
i
ng
doc:
drop
b
ackslash quo
t
ing
o
f so
m
e cu
r
ly
braces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
e
ff King
doc
:
c
onvert \--option
t
o --option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Je
f
f K
i
ng
doc
/
add:
r
eformat `--edit` option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff Ki
n
g
doc: fix length
of underlined section-tit
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
d
o
c: fi
x
hangin
g
"
+"-c
o
nt
i
nu
a
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: fix un
q
uoted use of "{type}"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
ef
f
King
doc: fix misren
d
ering
d
ue
t
o `single quote'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff Ki
n
g
d
o
c
: fix
unmatched co
d
e fences
i
n
g
i
t
-s
t
ripspace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
ano
Merge branch 'mh/write-refs-so
o
ner-2
.
3'
into mh/wri
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
M
i
chael Haggerty
ref_transact
i
on_comm
i
t():
f
ix atomi
c
ity and
a
vo
i
d fd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
M
i
chael
Haggerty
ref_tra
n
sacti
o
n
_
c
ommit():
re
m
ove the local flags va
r
iable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
ref_transaction_commit(): inli
n
e call
to wri
t
e_ref_sha1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michae
l
Haggerty
rename_ref(
)
: inline calls
t
o w
r
ite_ref_sh
a
1() from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hagger
t
y
commit_ref_update(): new fu
n
ction, ext
r
acted from write_ref_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
M
i
c
h
ael
H
a
gg
e
rty
w
rite_re
f
_to_lockfile():
n
e
w function, extract
e
d from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stefan Beller
t7
0
0
4: rename ULIMIT
te
s
t
p
r
e
r
equisite to ULIMIT
_
STACK_S
I
Z
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
S
tefan Bell
e
r
u
p
date-ref: t
e
st handling lar
g
e transactions properl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
Merge b
r
anch 'mh/write-re
f
s-
s
ooner-2
.
2'
into m
h
/
w
rite
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
ref_transaction_commit(): fix atomi
c
ity and av
o
i
d fd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Micha
e
l Haggerty
ref_trans
a
c
t
i
on_co
m
mit():
remove
the local fl
a
gs
variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hag
g
erty
ref_t
r
an
s
ac
t
ion_
c
ommit
(
): inline c
a
ll to write_ref_
s
ha1
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Micha
e
l
Haggerty
r
en
a
m
e_ref(): inline calls to write_ref_
s
ha1(
)
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
M
i
chael Haggerty
commit_r
e
f_u
p
date():
n
ew
funct
i
on
,
extracted from w
r
ite_ref_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Ha
g
gert
y
write
_
r
ef
_
to_lockfile(
)
:
n
ew function, extracted from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stefan
B
e
l
ler
t7004
:
rename ULIMIT test
p
rerequisite
t
o UL
I
MIT_S
T
ACK_SIZE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
a
dd: check retur
n
value of launch_edit
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
SZEDER Gábo
r
completion: si
m
plify q
u
ery
fo
r
config variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
SZEDE
R
Gábor
com
p
l
e
tion: add a helper fu
n
c
t
ion to
g
et co
n
fig variab
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
Jean-
N
o
e
l
Avila
d
o
c: fix unmatc
h
ed co
d
e
fences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next