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'
2015-05-26
Junio C Ha
m
an
o
Merge branch '
p
t/pu
l
l-ff-v
s
-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch '
p
t/pull-l
o
g-n'
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o C Ham
a
no
M
erge branch 'jk/re
r
er
e
-forget-
c
heck-en
a
bled'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Fo
u
rt
h
b
a
tch f
o
r 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o
C Hamano
Merge branch '
p
s/doc-pack
f
ile-vs-pack-file'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Ha
m
a
n
o
Merge bran
c
h
's
b
/t1020-cleanup'
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio C Hamano
Merge
bra
n
ch 'lm/s
q
u
e
lch-bg-
p
rogress'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
Me
r
ge bra
n
ch 'jc/ign
o
re-epipe-in-filter'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
M
e
rge br
a
nch 'mh/clone-v
e
rbos
i
ty-fix'
commit
|
commitdiff
|
tree
2015-05-22
J
u
n
io C H
a
m
a
no
Merge branch 'pt/pull-
t
a
g
s-err
o
r-diag'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Hamano
Merge branch
'
m
h/lockfile-re
t
ry'
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio C Hamano
M
erge branch 'jk/add-e-kill-edi
t
or'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C
Hamano
Merge branch 'sg/complet
i
o
n
-config'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
M
erg
e
br
a
nch 'mh/ref-directory-file
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch 'mh/
w
r
i
te
-
refs-s
o
oner-
2
.
4'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Hamano
Merge branch 'mg/log-decora
t
e-
H
EAD'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Ham
a
no
Merg
e
br
a
n
c
h 'jk/asci
i
doc-markup-fi
x
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
H
amano
Merge branch
'
jk
/
strips
p
ac
e
-asci
i
d
o
ctor-f
i
x'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C Hamano
M
e
rge
bra
n
c
h 'ja
/
tu
t
oria
l
-
asciidoct
o
r
-fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Ham
a
n
o
Merge bran
c
h 'sg
/
h
e
lp-su
b
c
omm
a
nds'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
H
a
m
a
no
Merge branch 'ps/bundle-ve
r
ify-arg'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge
branc
h
'ls/http-ssl
-
c
i
pher
-
l
i
s
t'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o C
H
amano
Merge branch
'dl/subtree-a
v
oid-tricky
-
echo'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
H
amano
Merge branch 'jk/skip-http-tes
t
s-under-no-cu
r
l'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Hamano
M
erg
e
bran
c
h 'dl/subtree-pus
h
-no
-
squash'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Haman
o
M
erge
b
ranch 'sg/compl
e
tion-omit-
c
redential-help
e
rs'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Haman
o
Merge
b
ran
c
h
'
dl/br
a
nch
-
error-message'
commit
|
commitdiff
|
tree
2015-05-22
Patri
c
k
S
t
einhardt
d
o
c
:
f
i
x inco
n
sisten
t
spelling of "pac
k
f
i
le"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hamano
fil
t
er_buffer_or_fd(): ignore EPIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
c
o
py
.
c:
m
ake
copy_fd(
)
repor
t
its st
a
tus si
l
e
n
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
a
ma
n
o
Thi
r
d bat
c
h for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
am
a
no
Merge branch 's
b
/ref-lock-lose-loc
k
-fd'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Mer
g
e branc
h
'kn/cat-fi
l
e
-
lite
r
ally'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge
b
r
a
nch
'nd/dwim
-
wil
d
ca
r
ds-as-
p
a
thspe
c
s'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Ham
a
no
Merge b
r
an
c
h 'jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'ph/reb
a
se-i-redo'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
Merg
e
branch
'
j
c
/
t
e
st-p
r
ereq-validate'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
Merge branch
'bc
/
connec
t
-
plink'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge bra
n
c
h 'jk/t
e
s
t-chain-lin
t
'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Ha
m
ano
M
erge branch
'fg/docume
n
t
-commit-
m
essage-stripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
r
g
e
branch 'jk/stash-require-clean
-
ind
e
x'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge bra
n
ch 'j
k
/git-no-more-argv0-path-munging'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
Mer
g
e br
a
nch 'j
c
/gitignore-precedence'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ham
a
no
Merge branch
'
nd/di
f
f-i-t-a'
commit
|
commitdiff
|
tree
2015-05-19
Jeff Kin
g
progr
e
s
s
:
tre
a
t
"
n
o ter
m
inal" as being in the foreground
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Mike Homme
y
clone: call tr
a
n
s
port_set_verb
o
sity befor
e
anyth
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Stefan Bell
e
r
subdir
e
ctory tests: co
d
e cleanup, uncom
m
ent test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
pul
l
:
pa
r
se pull
.
ff as a bool o
r
string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
p
u
ll: make pull
.
f
f=true override
merge
.
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
P
a
u
l
T
an
pu
l
l:
h
a
ndle --log=
<
n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
P
a
t
r
ick Steinhardt
p
a
ck-protocol
.
txt: fix ins
c
ons
i
stent spellin
g
o
f
"p
a
ckfi
l
e
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patri
c
k
Steinhardt
gi
t
-
unpack-objects
.
txt: f
i
x inconsisten
t
spelling of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patrick
S
te
i
nhardt
git-ver
i
fy-pack
.
tx
t
: fix i
n
consi
s
tent s
p
elling o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Michael H
a
gg
e
rt
y
lock_packed
_
refs(): allow retries when acquiring the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Michael Haggerty
l
o
ckfile: allow file lock
i
ng to b
e
retried with a timeout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Je
f
f King
re
r
er
e
: e
x
it silently on "f
o
r
g
et" when re
r
ere is d
i
sabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul Tan
pul
l
: remo
v
e --tags
error i
n
n
o
m
erge can
d
idates
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Jeff
King
doc: c
o
nve
r
t Ascii
D
o
c {?foo} to if
d
ef::
f
oo
[
]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
S
ync with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
a
n
o
Git 2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio
C H
a
mano
Merg
e
bran
c
h 'sb/line-l
o
g-plug-pairdiff-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Hama
n
o
Merge branch
'
sb/test-bitm
a
p-fre
e
-at-end'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C
Ha
m
ano
Merge br
a
n
ch 'nd/
t
1509-chroo
t
-test' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
ma
n
o
Merge
b
ranch '
j
k/type
-
from-string-gently' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
Merge branch 'ep/fi
x
-test-lib
-
functions-repo
r
t' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Haman
o
Me
r
ge branch '
c
n/b
o
m-in
-
gitign
o
re' into
m
aint
commit
|
commitdiff
|
tree
2015-05-13
J
un
i
o C Hamano
Merge bra
n
c
h
'jk/prune-
m
time' into maint
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C Hamano
Merge b
r
anch 'jk/
i
nit-core-worktree-a
t
-root' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
log: d
o
not sh
o
rten decora
t
i
on names too early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Ham
a
no
log: decorate HEAD
w
ith bra
n
ch name under --decorate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff K
i
ng
do
c
: put example URLs and
email
s
i
n
s
i
de literal backticks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
e
ff King
d
oc: drop
b
ackslash quo
t
i
ng of some cur
l
y
braces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc
:
convert
\--option
to --option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc/
a
dd:
reformat `--edit` option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc:
f
ix length of
unde
r
lin
e
d
se
c
ti
o
n-titl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jef
f
King
doc: fix han
g
ing "+"-continuati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc:
f
ix unquoted
use o
f
"{type
}
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc:
f
ix
misrend
e
ring
due to `
s
ingle
q
uot
e
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
d
o
c: fix unma
t
che
d
code fences in gi
t
-
s
t
r
ipspace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Hamano
Merge
b
ra
n
ch 'mh/write-
r
ef
s
-so
o
n
er-2
.
3' i
n
to mh/wri
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
r
e
f
_t
r
an
s
action_c
o
m
m
it():
fix a
t
omicity and avo
i
d fd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Ha
g
gerty
ref_
t
r
ansa
c
tion_commit(): remove the local flags variabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
ref_transact
i
o
n_com
m
it(): inline call to write_ref_
s
ha1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Micha
e
l
H
agger
t
y
r
e
name_ref(): i
n
li
n
e cal
l
s to writ
e
_re
f
_sha1()
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hagge
r
ty
commit_
r
ef_update(): ne
w
funct
i
on, extra
c
t
e
d
fro
m
write_
r
e
f_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hag
g
erty
write_ref_to_lock
f
ile(): new function, extracted from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stef
a
n Beller
t70
0
4: rename ULIMIT tes
t
prerequisite
to ULIMIT_STACK_SIZE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stef
a
n Beller
update-ref: t
e
st
handling large tr
a
nsactions p
r
operly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Haman
o
M
erge branch 'mh/write-
r
ef
s
-soo
n
er-2
.
2' into
m
h/write
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
M
i
chael
H
aggert
y
ref_transaction_commit():
fix a
t
omicity and avoid
f
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Mi
c
hael
H
aggerty
re
f
_transacti
o
n_commit(
)
: remove the loca
l
fl
a
gs variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Ha
g
gerty
ref
_
transaction_co
m
mit(): inline call
t
o write_ref_sha1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Mich
a
el Haggerty
rename_ref(): inline
calls
t
o wri
t
e_ref_sha1() from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael
Haggerty
commi
t
_ref_upd
a
te
(
)
: new
function,
e
x
t
racted from write_ref_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Micha
e
l
Hag
g
ert
y
write_ref_
t
o_lockfile(): n
e
w function, extracted from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stefa
n
Be
l
ler
t70
0
4: rename ULI
M
IT test prer
e
quisite to ULIMIT_STACK_S
I
ZE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Je
f
f King
a
d
d:
ch
e
ck return v
a
lue o
f
launch_editor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
SZEDER Gábor
compl
e
tion: simplify query for confi
g
v
a
riables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
SZEDER Gábor
comp
l
etion:
a
dd a
h
e
l
p
e
r
function to
g
et config variable
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
J
ean-Noel A
v
il
a
doc: f
i
x unmatched code fences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next