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 'da/mergetool-winmerge' into next
2015-05-26
Junio
C H
a
mano
Merge b
r
anch 'da/merg
e
tool-wi
n
merg
e
' into next
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bra
n
c
h 'mc/
c
ommit-doc
-
grammofix' into next
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
branch 'j
h
/filt
e
r-empty-contents' into next
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C
Hamano
Merge branch 'jk/http-
b
ackend-d
e
adlo
c
k' into next
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
b
r
anch 'dt/cl
e
an-pathsp
e
c
-fil
t
er-
t
hen-ls
t
at'
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bra
n
ch
'
jk/http-
b
ackend
-
deadlock-2
.
3' int
o
jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
an
o
M
e
rge
branch 'jk/h
t
tp-backend
-
deadlock-2
.
2' into j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
http-backend: spool ref
n
e
go
t
iation req
u
ests to b
u
ff
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-23
Junio C Ham
a
no
Syn
c
with
m
as
t
er
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Fourth batch for
2
.
5 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-22
Junio C Haman
o
Merge branch 'ps/doc-packfile
-
vs-pack-file'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io
C
Ha
m
a
no
Me
r
ge br
a
nch
'
sb/t10
2
0-cleanup'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C Hamano
Merge branc
h
'lm/squelc
h
-bg-progress'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hama
n
o
Merge branch 'jc
/
i
gn
o
re-
e
p
i
pe-in-filter'
commit
|
commitdiff
|
tree
2015-05-22
Junio C H
a
mano
Merge branch 'mh/
c
lone
-
v
e
rbosity-fi
x
'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o C
Ha
m
ano
Merge branch '
p
t/pu
l
l-tag
s
-error-diag'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C
Haman
o
Merge branch 'mh
/
lockfile
-
retry'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Haman
o
M
er
g
e
branch '
j
k/
a
dd-e-kill-editor'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Mer
g
e
b
ranch 'sg/
c
o
m
pletion-config'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C H
a
mano
M
er
g
e branch 'mh
/
r
e
f-direc
t
ory-file'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge bran
c
h 'mh/wr
i
te-refs-sooner-2
.
4'
commit
|
commitdiff
|
tree
2015-05-22
J
uni
o
C
H
a
m
a
n
o
Mer
g
e branch 'mg/
l
og-
d
ecorate
-
HEAD'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o
C Ham
a
n
o
Merge
b
ranch 'jk/asciidoc-markup
-
fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Hama
n
o
Merge
branch 'jk/stripsp
a
ce-asciidoctor-fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Hamano
Merge bran
c
h 'ja/tut
o
rial-ascii
d
octor-fix'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Haman
o
M
e
r
ge
branch
'
sg
/
h
e
lp-subcommands'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o
C Hamano
Merge branch 'ps/bundle-ver
i
fy-a
r
g'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C
H
a
mano
Merge
b
ra
n
ch 'l
s
/htt
p
-ssl-cipher
-
list'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge
b
r
a
n
ch
'
dl/subtree-avoid
-
trick
y
-echo'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merg
e
bran
c
h
'jk/s
k
ip-http
-
t
ests-un
d
er-no-cur
l
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Ham
a
n
o
Merge
bran
c
h
'dl/subtree-push-no-squash'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
M
erge branch 'sg/co
m
pl
e
tion-omit-c
r
edenti
a
l-h
e
l
p
e
rs'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C Hamano
Merge
b
r
a
nch 'dl/bran
c
h-error-message'
commit
|
commitdiff
|
tree
2015-05-22
Patrick S
t
ei
n
ha
r
dt
d
oc: fix inc
o
n
sist
e
nt spelling o
f
"packfile"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Junio C
Hamano
M
e
rge bra
n
ch 'rs/plug-leak-in-pack-
b
itmaps' into next
commit
|
commitdiff
|
tree
2015-05-20
Ju
n
io C Ham
a
n
o
Merge branch
'
ps
/
do
c
-packfile
-
vs-pack-file' into next
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hamano
Merge
b
ra
n
ch 'sb/t1020-
c
leanup' into
n
ext
commit
|
commitdiff
|
tree
2015-05-20
Junio C H
a
m
a
no
Me
r
ge b
r
a
n
c
h
'pt/pull-log
-
n' i
n
to next
commit
|
commitdiff
|
tree
2015-05-20
Junio
C Hamano
Merg
e
b
ranch 'pt/pull-ff-
v
s-
m
erge-ff' in
t
o ne
x
t
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hamano
M
erg
e
branch 'jc/ignore-epipe-in-
f
i
lter' int
o
next
commit
|
commitdiff
|
tree
2015-05-20
Jun
i
o
C
Hama
n
o
Me
r
ge
branc
h
'lm/sq
u
elch
-
bg-progress' into next
commit
|
commitdiff
|
tree
2015-05-20
J
u
nio
C
Hamano
Merg
e
branch 'm
h
/clone
-
verb
o
sity-fix' into next
commit
|
commitdiff
|
tree
2015-05-20
Ju
n
io C H
a
mano
Merg
e
branch 'pt/pull-tag
s
-
error-dia
g
' int
o
next
commit
|
commitdiff
|
tree
2015-05-20
Ju
n
i
o
C Hamano
Merg
e
b
ra
n
ch 'mh/lockfile-retry' into next
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetools: add winmerge as
a
b
uiltin
t
ool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
D
a
vi
d
Agui
l
a
r
merget
o
ol-
-
lib:
s
et IFS for difftool and mergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Jeff King
t555
1
: factor out tag creation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hama
n
o
f
i
l
t
e
r
_
buf
f
er_or_fd(): ign
o
re EPIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
M
i
ch
a
el
Coleman
Documentation/git-comm
i
t: g
r
a
mmofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
co
p
y
.
c: make
c
opy_fd() repor
t
its stat
u
s silently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Sync
w
i
th ma
s
ter
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Hamano
Merge branch 'mh/write-r
e
fs-
s
oo
n
er-
2
.
4
'
into next
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
man
o
Merge b
r
a
n
ch 'nd/untracked-cache' into next
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
man
o
M
e
rge br
a
nch
'jk/rerere-forget-check-enabled'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-19
J
u
ni
o
C
H
amano
Merge branch 'jk/asciidoc-mark
u
p-fix'
i
nto nex
t
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C H
a
mano
Merg
e
b
ranch
'
mg/lo
g
-
decorate
-
HEAD
'
into next
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C H
a
mano
Merge branch 'sg/comple
t
i
on-
c
onfig' into n
e
x
t
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Mer
g
e branch 'jk/ad
d
-e-k
i
ll
-
edi
t
or' into next
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C
Ham
a
no
Mer
g
e branch
'jk/stripsp
a
ce-asciidoc
t
o
r
-fi
x
' in
t
o ne
x
t
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Mer
g
e branch 'ja/tutoria
l
-asciidoctor-fix' into next
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Hamano
Me
r
g
e branch 'mh/ref-directory-file' int
o
ne
x
t
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
io C Hamano
Third batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
mano
Merge bran
c
h
'
sb/ref-lock-lose
-
l
ock-fd'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hama
n
o
Merge
branch 'kn/cat-fi
l
e-lite
r
a
l
ly'
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
ma
n
o
Merge br
a
nch 'nd/dwim-wildca
r
ds-a
s
-pathspe
c
s'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
Merge branch 'jc/merge
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge bra
n
ch '
p
h/rebase
-
i
-
r
edo'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
rge branc
h
'jc/test-pr
e
req-validate'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
M
erge bra
n
c
h
'
b
c/conn
e
c
t
-plink'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
rge bra
n
ch 'j
k
/
t
est-cha
i
n-
l
int'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Mer
g
e b
r
anch '
f
g/
d
o
c
ument-commit-messa
g
e-stripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
Merge branch '
j
k/stas
h
-req
u
ire-clean-index'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Ham
a
no
Merge bra
n
ch 'jk/git-n
o
-more-argv0-path-
m
ung
i
n
g
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'jc/gitignore-precedence'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
M
erge branch 'nd/diff-i-t
-
a'
commit
|
commitdiff
|
tree
2015-05-19
Je
f
f
King
pr
o
gress: treat "
n
o terminal" as
b
eing
i
n the foreg
r
ound
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
René Sc
h
arf
e
pack-bitmaps:
p
lug memory leak
,
fix allocation s
i
ze
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Mike
H
omme
y
c
l
one: ca
l
l tra
n
s
port_set_verbosity be
f
ore
a
n
yth
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Ste
f
an Bel
l
e
r
s
ubdirectory tests
:
code cleanup
,
uncomment test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Dav
i
d Tu
r
n
e
r
cl
e
a
n:
o
n
l
y l
s
tat fil
e
s
i
n
pathspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul T
a
n
pu
l
l: parse
pul
l
.
ff
a
s
a
bool or str
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
pul
l
:
m
ake pull
.
ff
=
true ove
r
ride merge
.
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
P
a
u
l
Tan
pull: handle --log=<n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Ji
m
Hill
sha1_f
i
le: pass
empty bu
f
fer to index
e
m
pty file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Patrick Stei
n
h
a
rdt
pac
k
-
p
rotocol
.
txt: fix ins
c
onsistent spelling o
f
"pack
f
i
le"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
P
a
tr
i
ck Steinha
r
dt
gi
t
-u
n
pac
k
-
obj
e
c
t
s
.
txt: fix incons
i
s
t
ent spel
l
ing of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
P
a
t
r
ick Steinhardt
git-verify-pack
.
txt: fi
x
i
n
cons
i
sten
t
sp
e
lling
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-15
J
eff King
h
t
tp-backen
d
:
f
ix die recursion
w
ith cu
s
tom
hand
l
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
M
i
chael Hagger
t
y
l
oc
k
_packe
d
_refs(): allow retries when ac
q
u
i
ring the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
M
i
chael Haggerty
lockf
i
le
:
allo
w
file locking to be retried with a
t
imeout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Je
f
f King
rerere: ex
i
t sil
e
ntly on "forget" w
h
en rere
r
e
is disabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul Tan
p
ull: rem
o
v
e
--tags erro
r
in no
m
erge
candid
a
t
es cas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
J
e
ff King
doc: c
o
nvert
A
s
ci
i
D
o
c {?foo} to ifdef::foo[]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C Hamano
Sync with mast
e
r
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Sync with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
amano
Git 2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Haman
o
Merge branch 'sb/line-log-plug-pairdiff-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge bran
c
h 'sb/test-bitmap-f
r
ee-at-end' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Me
r
g
e branch '
n
d/t150
9
-
c
h
root-test' into m
a
int
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
Mer
g
e
branch
'
jk/type-
f
r
o
m-string-gently' in
t
o m
a
i
nt
commit
|
commitdiff
|
tree
next