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
Sync with master
2015-06-05
Junio C Ha
m
a
n
o
Syn
c
with master
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Sync wit
h
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Ha
m
ano
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Th
e
f
irst half
o
f the
s
ev
e
nth
b
a
tch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'ld/p4-ed
i
tor-mult
i
-w
o
rd
s
'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
g
e branch 'bc
/
object-id'
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge
branch 'jk/
a
t-push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'dl/branch-err
o
r-message'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C H
a
m
a
no
Merge branch 'j
k
/skip-http-tes
t
s
-under-n
o
-cu
r
l' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ha
m
ano
Merge branch '
p
s/doc-packfile-vs-pack-
f
ile' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
a
mano
Merge branch 'fg/document-commi
t
-message-
s
tripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge br
a
nch 'jk/rerere-fo
r
get-che
c
k-enab
l
ed
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
M
e
r
g
e
b
ranch 'pt/pull-log-n' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Ham
a
no
M
erge branch 'pt/pu
l
l-ff-vs-m
e
rge-ff'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
M
erge
b
ranch 'r
s
/pl
u
g-leak-
i
n-pack-bitmaps'
into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C Hamano
M
e
rg
e
branch
'
ja/tu
t
o
ria
l
-as
c
iidoctor-f
i
x' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e br
a
nch 'jk
/
strips
p
ace-asciidoc
t
or
-
f
ix' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ham
a
no
Me
r
g
e branch 'jk/asciidoc-markup
-
fix' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Ha
m
ano
Mer
g
e br
a
nch 'ps/b
u
n
dle-verify-arg' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
mh/write
-
refs-sooner-2
.
4
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
amano
Merg
e
branch 'mh/ref-directory-file' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
Hamano
Merge branch '
m
g/
l
o
g
-
d
ecorat
e
-
H
EAD' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch 's
b
/t1020-clea
n
up' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
bran
c
h
'jc/gitignore-prec
e
dence' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Merge br
a
n
ch 'bc/connect-pli
n
k' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'p
h
/
r
ebase
-
i-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'jk/a
d
d-e-kill-editor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
Haman
o
Merg
e
bran
c
h
'
m
h/
c
lone-verbosit
y
-fix
'
into main
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge
b
ranch
'
jk/sha
1
-
f
ile-reduce-
u
s
e
l
e
ss
-
warning
s
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
M
erg
e
b
r
anch 't
b
/blame
-
resurrect
-
convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C Hamano
Merge branc
h
'jc/pl
u
g-
f
m
t
-
merg
e
-msg
-
le
a
k
'
i
nto main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
M
e
rge
b
ranc
h
'pt/
x
dg-config-pat
h
' into maint
commit
|
commitdiff
|
tree
2015-06-04
Junio C Haman
o
Merge b
r
anch 'nd/slim-index-pack-me
m
o
r
y
-usage' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
J
u
nio C
Ha
m
ano
M
e
rge branch
'
s
b
/pack-protocol-mention
-
smart-http'
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
J
u
nio C
Hamano
Mer
g
e
branch 'jk/make-fix-d
e
p
e
ndencies' into n
e
xt
commit
|
commitdiff
|
tree
2015-06-04
Junio
C
Hamano
Merge
branch 'jk/die
-
o
n-bo
g
us
-
worktree-late' int
o
next
commit
|
commitdiff
|
tree
2015-06-04
J
u
nio
C Hamano
Merge bran
c
h 'sg/merge-summary-config
'
int
o
next
commit
|
commitdiff
|
tree
2015-06-04
J
u
nio C H
a
man
o
Merge
bran
c
h
'
ah/send-emai
l
-sendmail-
a
lias' into next
commit
|
commitdiff
|
tree
2015-06-04
Jeff Ki
n
g
index-pack: fix
t
runcation of off_t in comparison
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
St
e
f
an Belle
r
Documenta
t
ion/techni
c
al
/
pack-pro
t
ocol: men
t
ion h
t
tp
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Sync with mast
e
r
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Ha
m
ano
Mer
g
e
b
ranch
'
tb/com
p
lete-seq
u
en
c
ing' into n
e
x
t
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge bra
n
c
h
'jk/s
q
uelch-missi
n
g-link-warning-
f
o
r
-unreacha
b
l
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
Merge branch 'pt/pull-t
e
sts'
into next
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge br
a
nch 'sb/glossary-submodule'
i
nto next
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o C Haman
o
Mer
g
e
branch 'sb
/
s
u
bm
o
d
u
le-doc-i
n
t
r
o
'
i
n
t
o
next
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Merge branch 'jk/
d
i
agnose-confi
g
-mmap-failure' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o
C Hamano
Merge b
r
anch '
m
t/p4-depo
t
File-at-version' int
o
n
e
x
t
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C H
a
mano
Merge bran
c
h
'mh/verify-
l
o
c
k-
e
r
r
or
-
report'
int
o
next
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
M
e
r
ge branc
h
'jk/color-diff-pla
i
n-is-c
o
ntext' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io
C Ha
m
ano
Merge branc
h
'jk/clon
e
-
d
i
ssociate' into next
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Haman
o
Merge branch 'jc/di
f
f-ws-error-highlight' i
n
to n
e
xt
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Sixth bat
c
h for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'sb/test-bitmap-free-at-
e
nd'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge
b
ra
n
c
h 'mm/rebase-i-post-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
erge branch 'fm/fe
t
ch-r
a
w
-
s
ha
1
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
m
a
no
M
e
r
g
e branch 'sg/hel
p
-group
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge bra
n
ch 'mm/
l
og-
f
ormat-raw-
d
oc
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Haman
o
Merge bran
c
h 'dt
/
cat-file-foll
o
w-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch
'rs/jan
i
torial'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
M
er
g
e branch 'jk/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
J
uni
o
C Haman
o
Merg
e
br
a
nc
h
'
d
a/
m
ergetool-wi
n
mer
g
e'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
Merge branch
'
mc/c
o
mmit-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge
branch '
j
h/
f
il
t
er-e
m
pty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
branch 'ah
/
u
sage-str
i
n
g
s
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio
C Hamano
Merge b
r
anch 'jk
/
http-b
a
ckend-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o
C Hamano
M
erg
e
branch 'dt/clean-p
a
t
hspec-filt
e
r-th
e
n-lstat'
commit
|
commitdiff
|
tree
2015-06-01
J
eff King
suppress errors
on missing UNINTERESTIN
G
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
silence br
o
k
e
n link wa
r
nin
g
s wit
h
revs->ignore_mi
s
sing_link
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
J
eff King
a
d
d quieter versions of
parse_{tree,comm
i
t}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Th
o
mas Braun
completion: suggest sequencer
c
ommands for rev
e
r
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Stefan Beller
glo
s
sar
y
: add "re
m
ote", "submodule", "su
p
erproject
"
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
J
e
f
f King
s
e
tup_git_directo
r
y: delay core
.
ba
r
e/core
.
w
o
rktree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff
K
ing
M
a
kef
i
le: silence perl/PM
.
st
a
mp recipe
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff
K
i
ng
Makefil
e
:
a
void
t
imes
t
amp
u
pdates to GI
T
-BUILD-
O
P
TIO
N
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff
K
ing
Makefile: drop
d
ependenc
y
bet
w
een gi
t
-i
n
staweb a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t
5520: check ref
l
og action in fa
s
t-forward
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5521: test
--dr
y
-run does not make any changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l
T
an
t5520:
t
est --rebase f
a
ilure o
n
unbor
n
branch with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t
5520:
t
est
-
-
rebas
e
with multiple branches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l
T
an
t5520: t
e
st
w
or
k
tree fast-fo
r
ward when fet
c
h updates
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t5520: test f
o
r failure if index has u
n
resolved entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Stef
a
n Beller
submodule d
o
c:
r
eorder i
n
trod
u
ctory
p
ar
a
g
rap
h
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Junio C Hamano
Merge br
a
nc
h
'
ah/usage-str
i
ngs' int
o
n
ext
commit
|
commitdiff
|
tree
2015-05-28
Junio C Hamano
Merg
e
branch 'jc/mer
g
e-drop-ol
d
-sy
n
t
a
x' into next
commit
|
commitdiff
|
tree
2015-05-28
Junio C H
a
mano
Merge branch 'ld/p4-editor-multi-words'
into next
commit
|
commitdiff
|
tree
2015-05-28
SZEDER G
á
bor
D
o
cumentation:
include 'm
e
r
ge
.
branchd
e
s
c
' for merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jun
i
o
C
Hamano
xmm
a
p(): drop
"Ou
t
of memor
y
?"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff K
i
ng
co
n
fig
.
c
:
rewrite ENODEV into
E
ISDIR when mmap f
a
ils
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff
K
ing
config
.
c: av
o
id xmm
a
p error mes
s
ages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff
K
i
n
g
conf
i
g
.
c: fix m
m
ap leak when writing
config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
J
eff King
read-cache
.
c: drop
P
R
O
T_WRITE from mmap of index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torro
j
a
p4: retrieve the right revision of the fi
l
e in UTF
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Hagg
e
rty
ref_tr
a
nsaction_c
o
mmit(): do not
capitali
z
e
erro
r
mes
s
ages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michae
l
Hagge
r
ty
veri
f
y
_
lock(): do not capita
l
ize error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michae
l
Haggerty
verify_lo
c
k():
r
epo
r
t erro
r
s via
a strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jun
i
o C Hamano
Sync with master
commit
|
commitdiff
|
tree
2015-05-27
J
eff Kin
g
diff
.
h
: r
e
name DIFF
_
PLAIN color slot
to DIFF_CONTEXT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff
:
accept color
.
diff
.
co
n
t
ext as a s
y
nonym for "plain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Ham
a
no
M
e
rg
e
branch 'nd/un
t
r
a
cked-cache'
commit
|
commitdiff
|
tree
next