repo.or.cz
/
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 Hamano
Merge branch 'pt/p
u
ll-ff-vs-me
r
g
e
-
ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
branch 'pt/
p
ull-
l
og-
n
'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C
H
am
a
no
M
erge branch '
j
k/re
r
ere-forget-c
h
eck-en
a
bled'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Fourth batch
for 2
.
5
cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio C Hamano
Merge branch
'ps
/
do
c
-packfile-
v
s
-
pack-file'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Mer
g
e branc
h
'sb/
t
1020-cleanup
'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Hamano
Merg
e
branch
'lm/squ
e
l
c
h-
b
g-progress'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Mer
g
e
b
ranch 'jc/ignore-epi
p
e-in-filter'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C
H
a
m
a
no
Mer
g
e bran
c
h 'm
h
/clone-v
e
rbosity-fix'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
Merge branch 'pt/pu
l
l-tags-error-diag'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o C Hamano
Merge branch 'mh/lockfile-retry'
commit
|
commitdiff
|
tree
2015-05-22
J
un
i
o C Haman
o
Merge br
a
nch 'jk/add-e-k
i
ll-editor'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Hamano
Mer
g
e branch 'sg/completion-conf
i
g'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
M
erge branch 'mh/ref-d
i
r
ectory-file'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
H
amano
Merge branch 'mh/write-refs-sooner-2
.
4'
commit
|
commitdiff
|
tree
2015-05-22
J
u
n
i
o C H
a
m
a
n
o
Mer
g
e branch 'mg/log-deco
r
ate-H
E
AD'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Hamano
M
e
rge
b
ranc
h
'j
k
/
asci
i
d
oc-markup-fi
x
'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o
C
Hamano
Me
r
g
e br
a
nch
'jk/stripspace-asci
i
doc
t
or-fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch 'j
a
/
t
u
torial
-
asciido
c
tor-fix'
commit
|
commitdiff
|
tree
2015-05-22
J
u
n
i
o C Ha
m
ano
Merge bran
c
h 'sg
/
hel
p
-subcommands'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge b
r
anc
h
'ps/bundle-verify-arg'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Haman
o
Merge br
a
nch 'ls/http-ssl-
c
ipher-lis
t
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
H
amano
M
erge
b
ranch 'dl/subtree-avo
i
d-tricky-echo'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch 'jk/ski
p
-
h
ttp-tests-un
d
er-no-c
u
rl'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Hamano
M
erge
b
ra
n
ch 'dl/subtree-push-no-s
q
ua
s
h'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Hamano
M
erge branch '
s
g/complet
i
on-om
i
t
-creden
t
i
a
l-helpe
r
s'
commit
|
commitdiff
|
tree
2015-05-22
Junio C H
a
mano
Merge b
r
anc
h
'dl/branch-error-
m
e
s
sage'
commit
|
commitdiff
|
tree
2015-05-22
Patric
k
Steinhar
d
t
doc
:
fix inconsistent spelling of "p
a
ck
f
ile"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hamano
filter_buffer_or_fd(): ignor
e
EPIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
copy
.
c
: make copy_f
d
() re
p
ort its statu
s
silently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Hama
n
o
Third ba
t
c
h
for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Merge
b
ranch 's
b
/ref-lock-los
e
-lock-
f
d
'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge branch
'
kn/c
a
t
-
file-l
i
te
r
a
l
ly'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Haman
o
Merge branch 'nd/dwim-wildcar
d
s-as-pathspecs'
commit
|
commitdiff
|
tree
2015-05-19
J
un
i
o C Hamano
Merge branch 'jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Me
r
g
e branch 'ph/reba
s
e-
i
-redo'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge b
r
an
c
h 'jc/test-prereq
-
val
i
date'
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
io
C Ha
m
a
no
Mer
g
e b
r
anch '
b
c
/
conn
e
ct-plink
'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hamano
Merge branch 'jk/test-chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Haman
o
Merge branch 'fg/do
c
ume
n
t-c
o
mmit-message-str
i
pping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge
b
ranch 'jk/s
t
ash-requi
r
e-cle
a
n-index'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Haman
o
M
e
r
ge
b
r
an
c
h
'jk
/
git-
n
o-more-arg
v
0-path-munging'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C
H
amano
Merge branch
'jc/gitignore-precedence'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch
'
n
d
/
diff-i-t-a'
commit
|
commitdiff
|
tree
2015-05-19
J
e
f
f King
progress: tre
a
t "no terminal" as b
e
i
ng i
n
the
f
oreground
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Mi
k
e
Ho
m
mey
clon
e
: call transpor
t
_set_verbos
i
t
y
before anyt
h
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
S
t
e
fan
B
elle
r
su
b
directory test
s
: code cleanup, uncommen
t
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
T
a
n
pull: parse pull
.
ff as a bool or string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
P
a
ul Tan
p
u
ll: make
pull
.
f
f
=
t
r
ue
override merge
.
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
p
u
ll: han
d
le
--log=<n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patr
i
ck Steinhardt
pack-protocol
.
txt:
fi
x
insc
o
ns
i
stent
spelling of
"pac
k
fi
l
e"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
P
atrick Steinhardt
git
-
unpack-object
s
.
txt: fix inconsistent spelli
n
g of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patrick
Ste
i
nhardt
g
it-verify-
p
ack
.
txt: fix incon
s
istent spe
l
ling of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Mi
c
hael Hag
g
erty
lock_packed_refs
(
): all
o
w retries when acquiring
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Michael Haggerty
loc
k
file: a
l
lo
w
f
ile lockin
g
t
o
be retried w
i
th a t
i
meout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Je
f
f King
rerer
e
: exit sile
n
tly
o
n
"fo
r
ge
t
" wh
e
n
rerer
e
i
s
d
i
sabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul Tan
pu
l
l: remo
v
e
--tags error in no merg
e
can
d
idates
c
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
do
c
: c
o
nve
r
t AsciiDoc {?foo} to ifdef::foo
[
]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Ha
m
ano
Sync with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
io
C
Ham
a
no
Git 2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Hamano
Merge branch 'sb/line-log-plug
-
pai
r
diff-le
a
k
' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
i
o
C Ham
a
no
Merg
e
branch 'sb/test-bitmap-free-a
t
-end' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Ham
a
n
o
Merge
b
r
anch 'nd/t1509-chroot
-
t
e
st'
into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
io
C
Hamano
Merge branch '
j
k/type
-
from-string-gently
'
into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'ep/fix-test-lib-f
u
nction
s
-report' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
unio C
Hamano
M
erge
b
ranch
'cn/bom-in-gitigno
r
e' in
t
o
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'jk/pru
n
e-mtime' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Ha
m
ano
Merge branch 'jk/init-core-w
o
rktree-at-ro
o
t' i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Ha
m
ano
log: do not shorten dec
o
ratio
n
names too ear
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Haman
o
log: decorate H
E
AD with br
a
n
ch name under --de
c
o
r
ate
.
.
.
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 emails in
s
ide lite
r
al backti
c
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
e
f
f
Ki
n
g
d
o
c
:
drop
b
ackslash q
u
oting
of so
m
e curly
b
r
a
ces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff Ki
n
g
do
c
: convert \
-
-option to -
-
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
e
ff King
doc/add: re
f
ormat `
-
-edit` option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff
King
doc: fix le
n
gth of underlined
s
e
ctio
n
-title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
e
ff
King
d
o
c:
f
ix hang
i
ng "+"-con
t
inuation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Je
f
f King
doc: fix unquoted use of
"
{t
y
pe
}
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Je
f
f King
doc
:
fix mi
s
rendering due to `single quote'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff
K
ing
doc:
f
i
x
unmatched cod
e
fences in git-str
i
pspace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Hamano
Merge branch 'mh/write-refs-soon
e
r-2
.
3' into
mh/write
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Mich
a
el Haggerty
ref_transaction_commit(): f
i
x
a
tom
i
city and
a
void
fd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Mic
h
ae
l
Haggerty
ref_tra
n
saction_c
o
mmit():
r
e
mo
v
e the local
flags va
r
i
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michae
l
Hagger
t
y
r
e
f_transaction_commit(): inli
n
e c
a
l
l
to writ
e
_re
f
_sha1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michae
l
H
a
gg
e
rty
r
e
n
a
me_ref(): inline
cal
l
s to write_ref_
s
ha1() from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Micha
e
l Ha
g
gerty
co
m
mit_ref_u
p
dat
e
():
n
ew function,
extracted from write_re
f
_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Micha
e
l Haggerty
write_ref_to_lo
c
kfile(): new
f
unctio
n
, extracted
f
r
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stefan Belle
r
t7004
:
r
e
na
m
e U
L
IMIT
t
e
st pre
r
equisit
e
to U
L
I
MIT_STACK_S
I
Z
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
S
t
efan Belle
r
update-ref: test handling
l
arge transactions properl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C
Haman
o
Merge branch 'mh/write-refs-sooner-2
.
2' into mh
/
write
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Mich
a
el Haggerty
ref_tran
s
a
c
tio
n
_commit(): f
i
x
atom
i
city and avoid fd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Micha
e
l Haggerty
ref_transaction_co
m
mi
t
(): remove the local flags var
i
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
ref_
t
ran
s
a
c
tion_comm
i
t(): inline call t
o
w
rite_r
e
f_sha1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
M
icha
e
l Hag
g
erty
rename_ref(
)
:
i
nl
i
ne calls
t
o write_ref_sha1() from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
com
m
it_ref_
u
pdate
(
): new fun
c
tion,
ext
r
acte
d
f
rom write_r
e
f_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
M
i
c
hae
l
Hag
g
erty
write_re
f
_to_
l
o
ckfile(): new function
,
e
x
tracte
d
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stefan
Beller
t7
0
04: rename ULIM
I
T
t
es
t
prerequisite to ULIM
I
T_STACK_SIZE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
ad
d
: check return
v
alue of launch_editor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
SZEDE
R
Gábor
completion
:
s
i
mplif
y
q
u
er
y
for confi
g
variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
SZEDER Gábor
co
m
plet
i
on: add a helper function to
get config variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
Je
a
n-Noel
A
vila
d
oc: fix unmatched code fences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next