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 'da/mergetool-winmerge'
2015-06-01
Junio
C
Hamano
Merge branch 'da/merg
e
too
l
-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
aman
o
Merge bra
n
ch 'mc
/
co
m
mit-doc-gr
a
mmofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
a
no
Mer
g
e
branch 'jh/filt
e
r-empty-
c
ontents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
bran
c
h 'ah
/
usage-stri
n
gs
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge b
r
a
n
ch 'jk/ht
t
p-ba
c
kend-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge br
a
nch 'd
t
/
c
l
e
an-
p
athspec-filter-then-ls
t
a
t
'
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
Merge branch 'nd/unt
r
acked-cache
'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7063: hid
e
stder
r
from setup i
n
side prer
e
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C
Hamano
S
ync wi
t
h
2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e
branc
h
'
j
k
/
still-i
n
teres
t
ing
'
into
ma
i
n
t
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C H
a
mano
M
erge branch
'jc
/
hash-object' into maint
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hama
n
o
Merge branc
h
'jk/rebase-quiet-no
o
p' in
t
o maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge br
a
nc
h
'sg/comp
l
ete-decorate-full-not-long' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
M
er
g
e
branch 'j
k
/filter-
b
ran
c
h
-
use-of-sed-on-incom
p
le
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hama
n
o
Merge
bra
n
ch 'jc/
d
a
emon-no-ipv6-
f
or
-
2
.
4
.
1'
into m
a
int
commit
|
commitdiff
|
tree
2015-05-26
J
un
i
o
C Hamano
Mer
g
e branc
h
'jk/s
t
ash-require-c
l
ean-index' into
main
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
M
e
rge branch 'jk/git-no-more-a
r
gv0-path-munging'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
F
i
fth b
a
tch for 2
.
5
cycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch '
n
d
/
u
n
t
racke
d
-
cache'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Merge branch 'rs/plug-leak-in-pack-bitmaps
'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C H
a
mano
Merge branch
'
p
t
/pull-ff
-
vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Haman
o
Merg
e
b
r
a
n
c
h 'pt/
p
ull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
branch
'j
k
/rerere-forget-ch
e
ck-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hama
n
o
Merg
e
branch 'jk/http-backend-deadlock-2
.
3' int
o
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Ha
m
ano
Merge branch 'jk/http-b
a
c
k
en
d
-deadl
o
ck-2
.
2'
i
nto jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
e
ff
K
ing
h
t
tp-backe
n
d
:
spool
r
ef negotiati
o
n req
u
ests to
buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Fourth
b
atch
fo
r
2
.
5
c
y
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
M
erge bra
n
ch 'ps/doc
-
packfile-
v
s-pack-file'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branc
h
'sb/t1020-cleanup'
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio
C Hamano
M
e
r
g
e
b
ranc
h
'lm/squelch-bg-p
r
ogress'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
H
a
m
a
n
o
M
e
rge
branch 'jc/ignor
e
-e
p
ipe-in-fi
l
ter'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C Ha
m
a
no
Merge br
a
nch 'mh/c
l
one-verbosity
-
f
ix'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
M
erge branch
'pt/pull-tags-error-diag'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
i
o C Hamano
M
e
rge branch 'mh/l
o
c
kfile-retry'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C Hamano
M
e
r
g
e
branch 'jk/add-e-kill-edit
o
r'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge
branc
h
'sg/completi
o
n-co
n
fig'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Haman
o
Merge branc
h
'
m
h/ref-directory-file'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch 'mh/write
-
re
f
s-sooner-2
.
4'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
M
e
rge b
r
an
c
h 'mg/log-decorate-HE
A
D'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Haman
o
M
e
rge bran
c
h
'jk/asci
i
d
o
c
-markup-fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
H
amano
Merge branch 'j
k
/strip
s
pace-asci
i
doct
o
r
-fi
x
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
M
e
rge branch
'ja/tutor
i
al-asciid
o
ctor-f
i
x'
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio C Ham
a
n
o
M
e
rge
branch '
s
g/help-subcommands'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Ha
m
ano
M
erge b
r
anch '
p
s/bu
n
dle-verify-arg'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Ham
a
no
Me
r
ge branch 'ls/
h
t
t
p-ssl-cipher-
l
ist'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
H
amano
Merge branch
'dl/sub
t
ree-avoid-tric
k
y-echo'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
Merge branch 'jk/skip-
h
t
t
p-test
s
-under-no-curl'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
i
o C Hamano
Mer
g
e bran
c
h '
d
l/
s
u
btree-push-
n
o-squ
a
sh
'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Hamano
Merge bra
n
ch
'
sg/co
m
p
l
e
t
ion-omi
t
-credential-helpers'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Hamano
Merg
e
br
a
nch 'dl/
b
ranch-
e
r
ror-message'
commit
|
commitdiff
|
tree
2015-05-22
Pat
r
i
ck Steinhardt
doc: f
i
x inconsist
e
nt spelling
o
f "p
a
ckfile"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
D
a
v
i
d
Aguilar
merge
t
oo
l
s:
add
winmerge as a builtin t
o
ol
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetool--li
b
: set
IFS for difftool
a
nd mergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Jeff King
t5551:
fa
c
tor o
u
t
t
ag cr
e
at
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Juni
o
C Hamano
fil
t
er_buffer_or
_
fd():
igno
r
e
EPIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Mi
c
hael
C
o
leman
D
ocumentation/git-co
m
mit: gram
m
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Hamano
copy
.
c:
m
ake copy_fd() report its
st
a
tus sile
n
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Th
i
rd batch for
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
M
e
r
ge
bra
n
ch 'sb/ref-lock-lose-lock-fd'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hama
n
o
Merge branch 'kn
/
cat-file-literally'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ham
a
no
Merge branch '
n
d/dw
i
m-wildcards-as
-
pathspecs'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
a
mano
Merge branch 'jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hama
n
o
M
erge branch 'p
h
/rebase-i
-
redo'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge branch '
j
c/test-prereq-validate'
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
mano
M
e
rge
b
ranch 'bc/co
n
nect-plink'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hamano
Merge branch 'jk/test-chain-
l
int'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io
C Hamano
Merge branc
h
'fg/docum
e
nt-c
o
mmit
-
m
essage-
s
tripp
i
ng'
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
ma
n
o
Merge branch
'jk/stash-req
u
i
r
e-
c
lean-
i
ndex'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'jk/gi
t
-
no-more-a
r
gv0
-
path-m
u
nging'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C
Hamano
Merge branch
'
jc/gitignore-prece
d
ence'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch
'nd
/
dif
f
-
i-t-a'
commit
|
commitdiff
|
tree
2015-05-19
Jeff
King
progress: tre
a
t
"
no termin
a
l" as bein
g
in the foreground
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Ren
é
Scharfe
pac
k
-bitmaps: plug memory le
a
k, fix allo
c
ati
o
n
s
ize
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Mike
Homme
y
clone: call tr
a
n
sport_
s
et
_
verb
o
sity before anythin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Stefan B
e
lle
r
subdi
r
e
c
tor
y
tests: co
d
e cleanup, uncomment test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
David Turner
cl
e
an: only lstat files
in pathspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
Tan
pull: parse pu
l
l
.
ff as a bool or stri
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
P
a
u
l
T
a
n
p
u
ll: ma
k
e pull
.
ff=true override merge
.
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
P
a
ul Tan
p
u
ll: handle --log=<n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Jim Hill
sha
1
_file: pass
e
mpty buffer to
index empty fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
P
at
r
ick Steinhardt
p
ack-
p
rot
o
col
.
txt: fix insconsi
s
tent spelling of "pack
f
ile"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patrick
S
t
einhardt
git-
u
n
pac
k
-obj
e
cts
.
tx
t
: fix inc
o
nsist
e
nt
s
p
elling of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patr
i
c
k
St
e
i
nh
a
rdt
g
it-verify-p
a
ck
.
txt: fix
i
n
consiste
n
t sp
e
lling of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-15
Jeff King
http-
b
a
c
kend: fix die recur
s
ion
w
ith
custom
handler
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Michael Ha
g
g
e
rty
loc
k
_packed_refs(): al
l
ow retries when ac
q
u
iring the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Michael Haggerty
loc
k
file: allow file locking t
o
be retried with
a
timeout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Jeff Ki
n
g
rerere:
exit silently on
"forget" when
r
er
e
re is disabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul
Tan
pu
l
l:
r
e
mo
v
e
-
-tags error in no merge candi
d
at
e
s case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
doc
:
co
n
v
e
r
t
A
s
ci
i
D
o
c {?foo}
to if
d
e
f
::foo[]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C Hamano
Sy
n
c with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
ano
Git 2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
unio C Hamano
Merge branch 'sb/line-log-
p
lu
g
-p
a
irdiff-l
e
ak' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
unio C
H
a
m
ano
Me
r
ge
branch 'sb/te
s
t
-bitmap-free-at-end' into main
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
man
o
Merge
b
ranch
'nd/t15
0
9-chroot-test'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C
Hamano
Me
r
ge
b
r
a
nch 'jk/type-from-string-
g
ently' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
mano
M
e
rge branch 'ep/fix-test-lib-
f
un
c
tions-repo
r
t' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
a
ma
n
o
Merge
b
r
anch '
c
n/
b
om-in-gitignore' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
a
m
ano
Merge b
r
anch 'j
k
/prune-mtime' in
t
o main
t
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
i
o C Hamano
Merge branch 'jk/i
n
it-core-
w
orktree-at-r
o
ot'
i
nto maint
commit
|
commitdiff
|
tree
next