repo.or.cz
/
git
/
mingw
/
j6t.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
Jun
i
o C
H
ama
n
o
Merge bran
c
h
'pt/
p
ul
l
-ff-vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
rge branch '
p
t/pul
l
-log-
n
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
br
a
n
ch 'jk/rerer
e
-fo
r
g
e
t-check-enab
l
ed'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C Haman
o
Fourth batch
for 2
.
5
c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Hamano
Merge br
a
n
ch 'ps/doc-packfi
l
e-vs-pa
c
k-file'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Ha
m
an
o
M
e
rge branch '
s
b/t102
0
-
c
leanup'
commit
|
commitdiff
|
tree
2015-05-22
Junio C H
a
mano
Me
r
ge branch
'
lm/squelch-bg-pr
o
gress'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Haman
o
Merge branch 'jc/ignor
e
-epipe-in-filter'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch 'm
h
/
clon
e
-verbosity-f
i
x'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C Hamano
M
e
rge branch 'pt/pull-tags-error-diag'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Haman
o
M
e
r
g
e branch 'mh/
l
ockfile-retry'
commit
|
commitdiff
|
tree
2015-05-22
Junio C H
a
mano
Merge branch 'jk/add-e-kill-editor'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
Merge bran
c
h
'sg/comple
t
ion-confi
g
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branc
h
'mh/re
f
-directory-file'
commit
|
commitdiff
|
tree
2015-05-22
J
u
n
io C Hamano
M
e
rge branc
h
'm
h
/write-r
e
fs-sooner
-
2
.
4'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C Ham
a
no
M
e
r
ge branch 'mg/log
-
de
c
orate-HEAD'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch 'j
k
/asciidoc-marku
p
-fix
'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Hamano
Merge b
r
anch 'jk/stripspace-asciidoctor
-
fi
x
'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
M
erge b
r
a
nch 'ja/tut
o
rial-asciidoctor-
f
ix'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
H
aman
o
Merg
e
branch 'sg/help
-
sub
c
o
mmands'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Hama
n
o
M
er
g
e branch
'
ps/bundle-v
e
r
i
f
y-arg'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hama
n
o
M
erge
bran
c
h
'
ls/htt
p
-ssl-cipher-list'
commit
|
commitdiff
|
tree
2015-05-22
J
un
i
o
C
Hamano
Merge
b
ranch
'dl
/
subtree-a
v
oi
d
-
trick
y
-echo'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Hamano
Me
r
ge bra
n
ch 'jk/skip-http
-
te
s
ts-under-n
o
-curl'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Ham
a
no
Me
r
ge branch
'dl/subtree-p
u
sh
-
no-squ
a
sh'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io
C
Hamano
Merge branc
h
'sg/completion-omit-credential-hel
p
e
rs'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch '
d
l/branc
h
-error-mess
a
ge'
commit
|
commitdiff
|
tree
2015-05-22
P
atrick Stei
n
hardt
doc:
fix inconsistent
s
pelling of "pack
f
ile"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hama
n
o
fi
l
ter_buffer_or_fd()
:
ignor
e
E
PIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
copy
.
c
: make copy_fd() rep
o
rt its
s
tatus sil
e
ntly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
i
o C Hamano
T
hird batch f
o
r
2
.
5
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
i
o
C Hamano
Me
r
ge b
r
anch '
s
b
/ref-lo
c
k-l
o
se-lock-fd'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch
'
kn/cat
-
fil
e
-lite
r
ally'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hama
n
o
Merge branch 'nd/
d
wim-wil
d
cards-as-pathspecs'
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
ma
n
o
Me
r
ge branch
'
jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ham
a
no
Merge bra
n
ch 'ph/rebase-i-re
d
o'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C
Ha
m
ano
Merge branch 'jc/test-prereq-validate'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
a
mano
Merge branch 'bc/con
n
e
c
t
-p
l
i
nk'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
rge
b
ran
c
h 'jk/tes
t
-chain-lint
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Haman
o
Me
r
ge branch 'fg/d
o
cumen
t
-commit-message-stripp
i
ng'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
M
e
rge branch 'jk/stash-requir
e
-clean-index'
commit
|
commitdiff
|
tree
2015-05-19
J
u
ni
o
C Hamano
Merge branch 'jk
/
git-no-more-argv0-path-munging'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Merge branch 'jc/
g
itignore-
p
receden
c
e'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
M
erge bran
c
h '
n
d/
d
i
f
f-i-t
-
a'
commit
|
commitdiff
|
tree
2015-05-19
Jeff Ki
n
g
pr
o
g
ress: treat "no t
e
rminal" as being in the foreground
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Mike Hommey
c
l
o
n
e:
ca
l
l
t
ran
s
port_set_verbosi
t
y befo
r
e any
t
hing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
S
t
efan Beller
s
ubdirec
t
o
ry tests: code clean
u
p,
u
ncomment test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: par
s
e 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: make
p
ull
.
f
f=t
r
u
e override merge
.
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l
Tan
pull: hand
l
e --log=<n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patrick Steinhardt
pa
c
k-protoco
l
.
tx
t
: fi
x
i
n
sconsisten
t
spe
l
ling
of "packfile"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patrick Steinhar
d
t
git-unp
a
ck-objec
t
s
.
txt
:
fix inconsistent spellin
g
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patrick Steinhardt
git-verify-p
a
ck
.
txt: fix
inconsis
t
ent spelling of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
M
ichael Hagge
r
ty
lock_pa
c
ked_re
f
s()
:
allow r
e
tries when acqui
r
i
ng
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Mi
c
h
a
el
Haggert
y
lo
c
kfile: all
o
w fi
l
e locking to be re
t
ried
w
ith a ti
m
eo
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
J
ef
f
King
r
e
r
e
r
e:
e
xit silently on
"
f
orget" whe
n
rerere
i
s disabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Pau
l
Tan
pull: remove --t
a
gs error in
no merge cand
i
dates case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
d
oc: c
o
nvert AsciiDoc {?foo} to ifdef
:
:f
o
o[]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
n
o
Sync with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Haman
o
Git 2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o
C
Haman
o
Merge br
a
nch 'sb/lin
e
-
l
o
g
-plu
g
-pa
i
r
d
i
f
f
-leak'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
amano
M
erge branch
'sb/test-bitma
p
-free
-
at-end' into maint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io
C
Hamano
M
erge
b
r
a
nch 'nd/t1509-chroot
-
test' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C
H
amano
Merge branch
'
jk/t
y
p
e
-from-string-gentl
y
'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
amano
Mer
g
e branch 'ep/fix-
t
est-lib-functions-re
p
o
r
t'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
unio C H
a
mano
Merge
b
ranch 'cn/b
o
m-i
n
-
g
it
i
gnore' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
ano
Merg
e
b
r
a
nc
h
'j
k
/prune-mti
m
e
' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
e
r
ge branch 'jk/init-co
r
e
-
worktre
e
-
at
-
root
'
into
m
a
int
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
log:
do not shorte
n
decoration names
too early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
unio C
H
a
mano
log: decorate HEA
D
w
i
th branch name under --decorate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
eff King
doc: put
exa
m
ple URLs and
em
a
ils i
n
s
i
d
e
li
t
era
l
back
t
icks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
eff King
doc
:
d
r
o
p back
s
lash quoting
o
f some curly b
r
a
c
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
eff Kin
g
d
oc:
conve
r
t
\--option to --option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
eff
King
d
o
c/add: reformat
`--
e
dit` o
p
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: f
i
x length of
u
nderlined
sec
t
ion-title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Je
f
f King
doc: fix hangin
g
"+"-con
t
inuation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: fix unquo
t
ed us
e
of "{t
y
p
e
}"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff Kin
g
doc: fix misrenderin
g
due to `single q
u
ote'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jeff K
i
n
g
doc:
f
ix unmatched
cod
e
fences
in
git-s
t
ripspace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
M
e
rge bra
n
c
h
'
mh/wri
t
e-refs-soo
n
e
r-2
.
3' into mh/write
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
ref_transact
i
on_comm
i
t():
f
ix atomicity and av
o
id fd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hag
g
erty
ref_
t
ransaction_commit(): re
m
ove the local f
l
ags var
i
abl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
M
ic
h
ael Haggerty
ref_
t
ransaction_commit(): in
l
ine call t
o
w
r
i
t
e_ref_sha
1
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hag
g
erty
rename_ref(
)
: inline calls to write_ref_sha1() fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
commit_ref_
u
pda
t
e(
)
:
n
ew funct
i
o
n, extracte
d
f
r
om write_ref_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael H
a
ggerty
write_ref_to_lockfile
(
): new
f
unction, extra
c
ted from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stefan
B
e
ller
t7004: rename ULIMIT tes
t
prerequ
i
site to UL
I
MIT_STACK
_
S
IZE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Stefan B
e
ller
update-re
f
: test handli
n
g larg
e
trans
a
c
tio
n
s
prop
e
rly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merg
e
b
ranch
'mh/writ
e
-refs-so
o
ner-2
.
2' into mh/write
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Michae
l
Haggerty
r
e
f
_tra
n
saction_co
m
mit
(
): fix atomici
t
y an
d
avoid
f
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
r
e
f_tr
a
nsaction_commit
(
): remove the local flags variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Mich
a
e
l
Haggerty
ref_transaction_commit():
inlin
e
call
to write_r
e
f_sha1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
M
ichael
H
aggerty
rename_ref(): inlin
e
calls to wri
t
e
_
ref_
s
ha1() from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hag
g
erty
commi
t
_ref_update(): ne
w
funct
i
o
n
, extracted from
write_ref_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hagger
t
y
write_ref_to_lockfi
l
e(): new fu
n
ction
,
ext
r
acted from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
S
t
efa
n
Beller
t7004
:
r
ename ULI
M
IT test p
r
erequi
s
ite to ULIMIT_S
T
ACK_
S
IZE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Je
f
f King
add:
c
heck return
v
alue of
l
a
u
n
c
h_e
d
it
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
SZEDER G
á
bor
complet
i
on: s
i
mpli
f
y query for config var
i
ables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-12
SZED
E
R Gábor
completio
n
: 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-Noel Avi
l
a
d
o
c: fi
x
un
m
at
c
h
e
d code fences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next