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
H
amano
M
erge branc
h
'pt/pull-ff
-
vs-merg
e
-ff' into next
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hamano
Merge branch 'jc/ig
n
or
e
-
e
pipe-in-fi
l
ter' into
n
ext
commit
|
commitdiff
|
tree
2015-05-20
J
unio C H
a
m
a
no
Merge
b
ranc
h
'lm/sq
u
e
l
c
h-b
g
-p
r
o
g
r
ess' int
o
next
commit
|
commitdiff
|
tree
2015-05-20
Jun
i
o C Ha
m
ano
Merge
b
ranch 'mh/clone-verbosity-fix' into next
commit
|
commitdiff
|
tree
2015-05-20
J
unio C
Hamano
M
e
rge branc
h
'
pt/pull-tags-error-diag' into next
commit
|
commitdiff
|
tree
2015-05-20
J
u
n
io C Ha
m
ano
Merg
e
bran
c
h '
m
h/lockfile-r
e
try' in
t
o
n
ext
commit
|
commitdiff
|
tree
2015-05-20
J
u
ni
o
C Hamano
filter_buff
e
r_or_fd(): ignore EPI
P
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
copy
.
c
:
make copy_fd
(
) repo
r
t its stat
u
s s
i
l
e
ntly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ham
a
no
Sync with maste
r
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
Merge branch 'mh/write-refs-sooner-2
.
4
' into next
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
Me
r
ge
b
r
a
n
c
h 'nd/untracked
-
cache' into next
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'jk
/
rerere-
f
orget
-
c
h
eck-enable
d
' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o
C
Ha
m
ano
Merge branch 'jk
/
a
s
ciidoc-
m
a
r
k
u
p-fi
x
' into next
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Ha
m
ano
Merge branch 'mg/log-
d
eco
r
ate
-
H
EAD' into
next
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C
Hamano
M
e
rge branc
h
'sg/completion-con
f
ig' into next
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Hamano
Me
r
ge bra
n
ch 'jk
/
a
dd-e-ki
l
l-
e
ditor'
i
n
to next
commit
|
commitdiff
|
tree
2015-05-19
J
uni
o
C Hamano
M
er
g
e branc
h
'
j
k/strip
s
pace-asci
i
doct
o
r
-
fix' in
t
o
next
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Hamano
M
erge branch 'ja/tutorial-a
s
ciidoct
o
r-fix' int
o
nex
t
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'mh/ref-di
r
ectory-
f
ile'
i
nto next
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C H
a
mano
Third batch for 2
.
5
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge br
a
n
ch '
s
b/
r
ef-loc
k
-lose-lock-f
d
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Me
r
ge b
r
anch 'k
n
/cat
-
f
ile-li
t
erally'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Merge br
a
nc
h
'
n
d/dwim-wildcards-a
s
-p
a
thspe
c
s'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hama
n
o
Merge bran
c
h 'jc/
m
erge'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C
H
aman
o
Merge branch 'ph/re
b
ase-
i
-r
e
do'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Ha
m
ano
Merge
branc
h
'
j
c/test
-
p
rer
e
q-validate'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Hamano
Mer
g
e branch 'bc/conn
e
c
t
-
p
link'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merg
e
branch 'jk/test-chain-lint
'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Ha
m
a
n
o
M
erge b
r
anch
'
f
g/document-commi
t
-me
s
sage-s
t
ripping
'
commit
|
commitdiff
|
tree
2015-05-19
J
uni
o
C
Hamano
M
e
r
g
e branch 'jk
/
s
t
ash-require
-
clean-i
n
d
ex'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Mer
g
e branch 'jk/git
-
no-more-argv0
-
path-munging'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o
C Hamano
Merge branch 'jc/gitign
o
r
e-prec
e
dence'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
M
e
rge branch 'nd/diff-i-t-
a
'
commit
|
commitdiff
|
tree
2015-05-19
Jeff
K
ing
progress: trea
t
"
n
o
t
e
rminal
"
as b
e
ing in the foreground
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Mike Hommey
clone: call transpor
t
_set
_
verb
o
si
t
y before an
y
thin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: parse pull
.
ff a
s
a bool or string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: mak
e
p
u
ll
.
f
f=t
r
ue
o
verride
merge
.
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Michael H
a
ggerty
lock_
p
acked_refs(): allo
w
r
etries when acqu
i
ri
n
g
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Michael Ha
g
g
e
rty
lockfile: allow file lockin
g
to be retrie
d
with a t
i
meout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
rer
e
re:
exit si
l
ently on "
f
orget" when rer
e
re is disabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
P
a
ul Tan
pull:
r
emove --tags
e
rr
o
r
in no merge
c
andidates cas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
d
o
c: co
n
vert Asci
i
Doc {?foo}
t
o ifd
e
f::foo[]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
a
m
a
no
Sync
w
ith m
a
ster
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
Sync
w
ith 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Git
2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o
C
Hamano
Me
r
ge branch 'sb/line
-
log-plug-p
a
i
rdif
f
-
lea
k
' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Hamano
Me
r
ge
bra
n
ch 'sb/test-bitmap-free-at-end'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-05-13
J
unio C Hamano
Merge branch 'nd/t
1
5
0
9-chroot-test' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
man
o
Merge
b
ranch 'jk/type-from-string-ge
n
tly' into
m
ain
t
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
i
o C Hamano
Merg
e
b
ra
n
ch
'ep/fix-test-lib
-
fu
n
ction
s
-
r
e
port' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'c
n
/bo
m
-in-gi
t
ignore' into m
a
int
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hama
n
o
Merge
b
ranch 'jk/prune-mt
i
me' into m
a
int
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o
C Hamano
Merge branch 'jk/init-core-wor
k
tree-at-roo
t
' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
log:
do not shorten d
e
cora
t
ion names too early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
unio C Hamano
log: decorate
H
EAD with branch
n
ame
u
nd
e
r --de
c
o
r
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
eff King
do
c
: put example URLs and emails inside
li
t
eral
b
ac
k
ticks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
e
ff
K
in
g
doc: drop backsl
a
sh
q
uoting of some cur
l
y braces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Je
f
f King
d
o
c: convert \--option
t
o --opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff
Kin
g
doc/a
d
d: r
e
format `
-
-e
d
it` option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
do
c
: fix length of und
e
rlined s
e
ction-tit
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: fix hanging "+"-conti
n
uatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff K
i
ng
doc: fix unquo
t
ed use of "{type}"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff Ki
n
g
doc: f
i
x
mi
s
renderi
n
g due to `s
i
ngle
quote'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jef
f
Ki
n
g
doc: fix u
n
matche
d
code fences in git-strip
s
pace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Ham
a
n
o
M
erge branch 'mh
/
write-refs
-
sooner-2
.
3' into m
h
/write
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Michael
H
agger
t
y
ref_tra
n
s
a
ction_commit()
:
fix atomicity and
a
void fd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
ref_transaction_commit(): remo
v
e the loca
l
flags variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hagg
e
r
ty
ref
_
transac
t
ion
_
commit
(
): inl
i
ne call
to write_ref_sha1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael H
a
ggerty
r
ename_ref(): inline cal
l
s
to write_ref_sha1() from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
commit_r
e
f_up
d
ate(): ne
w
function, extra
c
ted from write
_
ref_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Mi
c
hael Hagger
t
y
write_ref_to_lockf
i
le(): new fu
n
c
t
i
on, e
x
tract
e
d from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stefan Be
l
ler
t7004: rename
UL
I
MIT t
e
st
prerequi
s
it
e
to ULIMIT_ST
A
CK
_
SIZE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
S
tefan
B
e
l
l
e
r
update-re
f
:
t
e
st handl
i
ng l
a
rge transactions
p
roperly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
M
e
r
g
e branch 'mh/wri
t
e
-
r
e
f
s
-sooner-2
.
2' in
t
o
m
h
/wr
i
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
ref_transa
c
tion_commit(): fi
x
ato
m
icity and avoid
fd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hag
g
e
rty
ref_tran
s
action_commit(): rem
o
ve the local flags variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
re
f
_
transact
i
on
_
commit():
i
n
line
c
all to write_ref_s
h
a1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Mic
h
ael
H
a
g
gerty
re
n
ame
_
r
e
f(): inl
i
ne calls to w
r
i
t
e_ref
_
sha
1
() from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Mi
c
hael Haggerty
commit_ref_u
p
date
(
): new
f
unction, ex
t
racted from
wri
t
e_ref_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
M
i
chael Haggerty
write
_
ref_
t
o_lockfile(): ne
w
fu
n
ctio
n
, extracted from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stefa
n
Beller
t7004: rename ULIMIT test prerequisite
t
o ULIMIT_STACK_SIZE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff
K
ing
add: check return val
u
e
o
f launch_edi
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
SZ
E
DER
Gábor
compl
e
t
i
o
n: simplif
y
q
u
ery for config variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
SZE
D
ER Gábor
completion: ad
d
a helper funct
i
on to get
c
onfig varia
b
l
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
Jean-
N
oel Avila
doc: fix unmatch
e
d
c
o
de fences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
Junio
C Hamano
Me
r
ge branch 'sb/ref
-
lock-l
o
se-lock
-
fd' into next
commit
|
commitdiff
|
tree
2015-05-12
J
u
nio C Hamano
Merge br
a
nch 'kn/cat-file-literally' i
n
to next
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C H
a
mano
Merg
e
branch 'sg
/
help-subc
o
m
m
ands'
i
nto next
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
M
e
rge bra
n
ch
'
ps/bundle-ver
i
f
y
-arg' into n
e
xt
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
branch 'ls/
h
ttp-s
s
l-c
i
pher-list' int
o
ne
x
t
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Haman
o
Me
r
ge
b
r
anch 'dl/subtree-avoid-tricky-echo'
into
n
ext
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Ham
a
no
Mer
g
e branch 'jk/skip-http-test
s
-unde
r
-n
o
-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
ranch 'dl/sub
t
ree-p
u
sh-n
o
-squash' into next
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch 'sg/completion-om
i
t-
c
redentia
l
-
hel
p
ers
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Ha
m
ano
Merge branch 'dl/branch
-
error-message
'
in
t
o
ne
x
t
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Sync with mas
t
er
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Sync w
i
t
h
2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
G
i
t 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge branch 'mm/usag
e
-log-
l
-can-ta
k
e
-regex' int
o
maint-2
.
3
commit
|
commitdiff
|
tree
next