repo.or.cz
/
git
/
mjg.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' into next
2015-05-20
Junio C Haman
o
Merg
e
branch
'pt/
p
ull-ff-vs-merge-ff' int
o
n
ext
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hama
n
o
Me
r
g
e
br
a
nch 'jc/ignor
e
-epi
p
e
-
i
n
-filter'
i
n
to next
commit
|
commitdiff
|
tree
2015-05-20
Junio C H
a
m
a
no
Merge bra
n
ch 'l
m
/squelch-bg-progress' into
n
ext
commit
|
commitdiff
|
tree
2015-05-20
Ju
n
io C Hama
n
o
M
erge branch 'mh/clo
n
e
-verbos
i
ty-fix'
i
nto next
commit
|
commitdiff
|
tree
2015-05-20
Junio C Haman
o
Merg
e
branch 'pt/pull
-
tags-e
r
ror
-
d
iag'
i
n
t
o next
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hamano
Mer
g
e branch 'mh/loc
k
fi
l
e
-retry' into next
commit
|
commitdiff
|
tree
2015-05-20
J
u
nio C Ham
a
n
o
filter_
b
uffer_or_fd(
)
:
ignore EPIPE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Hamano
copy
.
c: make copy
_
fd()
r
epor
t
i
ts
stat
u
s
s
ile
n
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hama
n
o
Sync with master
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
a
n
o
Merge br
a
nch 'mh/write-refs
-
soon
e
r-2
.
4' into
n
e
x
t
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
Merge b
r
an
c
h 'nd/untr
a
cked-cache' into next
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
i
o C Haman
o
Merge branch 'jk/
r
ere
r
e-forget-
c
heck-enabled' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hamano
Merge
b
r
anch 'jk/asciidoc
-
m
a
rkup-fix'
i
nto next
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Ha
m
ano
Merge branch 'mg/l
o
g-dec
o
r
ate-HEAD' into
n
e
x
t
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hama
n
o
Merge branch
'sg
/
complet
i
o
n
-config
'
into next
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'jk/add-e-kill-edi
t
or'
i
nto nex
t
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
mano
Me
r
ge br
a
nch '
j
k/strips
p
ace-asciidoct
o
r-fix'
into nex
t
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
am
a
n
o
Merge bra
n
ch 'ja/tutorial-ascii
d
octor-fix' int
o
next
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hamano
Merge
br
a
n
c
h
'm
h
/
r
e
f
-di
r
e
c
tory-file'
into next
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Thi
r
d batch f
o
r 2
.
5 cy
c
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hamano
Merge branch 's
b
/ref-lock-lose-lock-
f
d
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
erge branch
'
kn/cat-fi
l
e-
l
iterally'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io
C
H
a
m
ano
M
e
rge branch 'nd/dwim-wildcards-as-pat
h
specs'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
Merge
b
ranch 'jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
H
a
m
ano
Merge bra
n
c
h 'p
h
/rebase-i-r
e
do'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Ha
m
an
o
Merge b
r
anch 'jc/test-prereq-val
i
date'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o
C Hamano
Merge branch 'bc/con
n
ect-plink
'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Ha
m
ano
Merge bra
n
ch
'
jk/test-chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Haman
o
M
er
g
e
bra
n
ch 'fg
/
d
ocument-com
m
i
t
-
m
e
s
sag
e
-s
t
r
i
ppi
n
g'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
Me
r
g
e
bra
n
ch 'j
k
/stash-require-clean-index'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merg
e
b
r
anch
'jk/git-n
o
-more-argv0-
p
a
t
h
-munging'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Hamano
Merge branch '
j
c/
g
i
t
igno
r
e
-prec
e
dence'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Ham
a
no
M
erg
e
branch 'nd
/
diff
-
i
-
t-a'
commit
|
commitdiff
|
tree
2015-05-19
Jeff King
pr
o
gress:
t
r
eat
"
no
t
erminal" as being in the for
e
g
round
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
Mike Hommey
clone: c
a
l
l transport_set_verb
o
sity be
f
o
r
e anything
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul
Tan
pull: pa
r
se pull
.
ff as a
b
ool o
r
s
tring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
a
ul Tan
pull: ma
k
e pull
.
ff=tru
e
overrid
e
m
e
rge
.
f
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Michae
l
H
a
ggert
y
loc
k
_packed_refs(): allow
r
etries when a
c
q
u
i
ring the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Mic
h
a
el Haggerty
loc
k
file: allow file locki
n
g to be retried with a timeout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Je
f
f Kin
g
r
erer
e
: ex
i
t
s
i
lently
on "forget" when rerer
e
is disa
b
led
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Paul Ta
n
pull: r
e
m
ove --tags err
o
r in no
m
erge candidates cas
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
do
c
:
c
on
v
ert
Asc
i
iDoc {?foo} to ifdef::foo[]
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Hamano
Sync with master
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Syn
c
with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
J
unio C Hamano
Git 2
.
4
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
ano
M
e
rge branch 'sb/line-log
-
plug-pairdiff-leak' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Haman
o
Merge b
r
anch
'
sb/test-b
i
tmap-free-a
t
-end' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
am
a
n
o
Merge branch
'
nd/t1509-
c
h
root-test' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
Merge branch 'jk/type-fro
m
-string-gentl
y
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hama
n
o
Merge branch 'ep
/
fi
x
-test-lib-
f
unctions-rep
o
rt' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
i
o
C Ham
a
n
o
Merge br
a
nch 'cn/bom
-
in-gitignore' into maint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Hamano
Me
r
g
e bran
c
h
'jk/prune-mtime' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
M
e
r
ge branc
h
'j
k
/
i
nit
-
c
ore
-
worktree-
a
t-root' into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
i
o C Hamano
lo
g
:
do
n
ot shorten de
c
oratio
n
names too ea
r
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C H
a
mano
log: d
e
corat
e
H
E
A
D
wit
h
branch nam
e
under
--deco
r
a
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff Kin
g
doc:
put ex
a
mp
l
e URLs
and ema
i
l
s inside li
t
e
ral bac
k
ticks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: drop ba
c
kslas
h
quoting of some curly braces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc
:
con
v
ert \--
o
ption to --option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff
King
doc
/
add: r
e
format `--
e
d
it`
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
d
o
c: f
i
x length of underlined section-
t
itle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
J
e
ff
K
ing
doc: fix
ha
n
g
ing "+
"
-continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Je
f
f
King
doc: fix un
q
uoted
use of "{type}
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff Ki
n
g
doc:
f
ix
m
isrender
i
ng due
to `single quote'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff
King
do
c
:
fi
x
unmatche
d
c
o
de fences in git-stripspace
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merg
e
branch 'mh/write-refs-so
o
ner-2
.
3' into mh/wri
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Mic
h
ael Hagge
r
ty
ref_tran
s
a
c
tion_commit(): fix atomicity and avoi
d
f
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
M
i
chael Haggerty
re
f
_transact
i
o
n
_
commi
t
(
):
r
emove the l
o
cal flags variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Mi
c
h
ael Haggerty
ref_transa
c
tion_comm
i
t(): inline call to
w
rite_ref_sha
1
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hagg
e
rty
rename_ref(): inl
i
ne calls to w
r
i
t
e_ref_sha1() from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Micha
e
l
Haggerty
commi
t
_ref_update(): new
fun
c
t
ion
,
extr
a
cted f
r
om write_ref_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Mic
h
a
e
l Haggerty
write_ref_to_lockfile(): new funct
i
on
,
extra
c
ted from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Stefan Beller
t700
4
: rename
ULI
M
IT test
prerequisi
t
e to ULIMIT_STACK_SIZE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Stefan Beller
upd
a
te-r
e
f: test ha
n
dli
n
g
larg
e
transactio
n
s properly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Hamano
Merge branch 'mh/write
-
refs-soo
n
er-
2
.
2' into mh/
w
rite
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Michael H
a
ggerty
ref_transac
t
ion_commi
t
(
): fix a
t
omic
i
ty
a
nd avoid fd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
ref_transaction_commit(): remove the local flags v
a
riabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Michael Ha
g
gert
y
ref_transaction_
c
o
mmit
(
): inli
n
e call
to write_ref_sha1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
M
i
chael
H
agge
r
t
y
r
ename_ref(): i
n
l
ine
calls to write
_
ref_sha
1
(
)
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Mic
h
ael H
a
g
g
erty
commit_ref_
u
pdate(
)
: ne
w
function,
extracted from write_ref_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Michael Ha
g
gerty
wri
t
e_
r
e
f_to_loc
k
fil
e
():
new function, e
x
tracted from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Stef
a
n
Belle
r
t70
0
4: re
n
a
me U
L
IM
I
T test
p
rere
q
uisite
t
o
U
LIMIT_STAC
K
_SIZE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
a
d
d: check retu
r
n
value
o
f
laun
c
h
_e
d
itor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-12
SZEDER Gáb
o
r
c
om
p
letion: s
i
m
plif
y
query f
o
r
c
onfig va
r
iables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-12
SZEDER Gábor
completion: add a
h
elper function to get config variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-12
Jean-
N
oel Av
i
la
doc:
f
i
x unmatch
e
d code
fences
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-12
Junio C Hamano
Mer
g
e branc
h
'sb/r
e
f-lock
-
l
ose
-
lock-f
d
'
i
n
to next
commit
|
commitdiff
|
tree
2015-05-12
Junio C Ham
a
no
Me
r
ge branch 'kn/cat-file-literal
l
y' i
n
t
o
next
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
branch 's
g
/help-subc
o
m
m
a
n
ds' into next
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C H
a
m
ano
Mer
g
e branch 'ps/bundl
e
-ver
i
fy-a
r
g' int
o
ne
x
t
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge branch
'
ls/http-ssl-cipher-
l
ist' i
n
to next
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o C
Haman
o
Merge bran
c
h
'dl/subtree-avoid-tr
i
ck
y
-ech
o
' into
ne
x
t
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ham
a
no
Merge branch 'jk/ski
p
-http-tes
t
s-under-no
-
c
url' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
Hamano
Merge branch
'
dl/subt
r
e
e-push-n
o
-
squash' int
o
next
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge branch 'sg/comp
l
etion-omit-credentia
l
-he
l
pers
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Me
r
ge branch 'dl
/
b
r
anch-error-
m
essage' i
n
to next
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Sync with m
a
ster
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Sync with 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Git 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
g
e bra
n
ch 'mm/usage-
l
og-l-can-take-regex' into mai
n
t-2
.
3
commit
|
commitdiff
|
tree
next