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
Juni
o
C
Hamano
Sync with master
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Sync with
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Git 2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
The first half of the seventh batc
h
for 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Me
r
ge
b
ranch 'ld/p4-e
d
it
o
r-m
u
lti-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch 'jk
/
at-pu
s
h-s
h
a1'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge
branch 'dl/branc
h
-
error-message' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C
Ha
m
a
no
M
erge branch 'j
k
/
s
k
ip-http-
t
ests-unde
r
-no
-
cur
l
' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'ps/doc-packfile-vs-
p
a
c
k-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
mano
Merge
branch
'
fg/document-c
o
mmit-message-stri
p
ping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'jk/rere
r
e-forget-check-enabled' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Ha
m
ano
Merge branch 'pt/pull-log-n'
i
n
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge bra
n
c
h
'pt/pull-f
f
-
vs-merge-
f
f' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge bra
n
ch 'rs/plu
g
-leak-in-pack-bit
m
aps' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch '
j
a
/
tutorial-ascii
d
octor-fix' i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Me
r
g
e
b
ran
c
h
'
jk/stripspa
c
e
-asciidoctor-fix'
i
nto m
a
in
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Hamano
M
erge
bran
c
h 'jk/asc
i
idoc-markup-fix'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
branch 'ps
/
bund
l
e-verify-
a
rg' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C
Hamano
Merge branch
'mh
/
write-refs-sooner-
2
.
4' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
man
o
M
e
rge branch 'mh/ref-direc
t
ory-
f
ile'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
H
amano
Merge branch 'm
g
/log-decorate-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C H
a
mano
M
erge branch 'sb/t1020-cleanup' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C H
a
man
o
Merge branch 'jc/g
i
tign
o
re-precedence
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branch 'bc/connect-plink' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Ha
m
ano
Merge branch 'ph/rebase-i-
r
edo
'
into m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch
'
jk/a
d
d-e-
k
ill-editor' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
mano
Merge branch
'
mh/clone-verbosity-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
jk/sha1
-
fi
l
e-redu
c
e-useless
-
w
arnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch '
t
b/
b
lame-res
u
rrect-convert-t
o
-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge
b
ranch 'jc/plug-f
m
t-merge-msg-le
a
k' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hama
n
o
Merge branch 'pt/xdg-config-path'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-04
Junio C
H
amano
Merge
b
ranch 'nd/
s
lim-index-pack-
m
emory-u
s
age'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
Junio C Hama
n
o
M
e
r
ge bra
n
ch '
s
b
/
pack
-
protocol-mention-smart-http'
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
Junio C Ha
m
a
n
o
Merge
b
r
anch
'
jk/make-fix-dependencies'
i
nto next
commit
|
commitdiff
|
tree
2015-06-04
Junio
C
Hamano
Merge br
a
n
c
h 'jk/die-on-bogus-worktree-late' into next
commit
|
commitdiff
|
tree
2015-06-04
Junio
C Hamano
Mer
g
e bran
c
h
'sg/merge-su
m
mary-conf
i
g' int
o
next
commit
|
commitdiff
|
tree
2015-06-04
Juni
o
C
H
amano
Merge branch 'ah/send-email-send
m
ail-alias' into
n
e
x
t
commit
|
commitdiff
|
tree
2015-06-04
Jeff King
i
ndex-
p
a
c
k:
fix t
r
uncation of o
f
f
_
t
in com
p
aris
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Stefan Beller
D
o
c
umentation/t
e
c
h
n
i
cal/pack-pr
o
toco
l
:
mention http
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
a
ma
n
o
S
y
nc with master
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
erge branch 'tb
/
com
p
lete-seque
n
cing' into n
e
xt
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C
H
amano
Merge branch 'jk/squelch-missing-
l
in
k
-
w
arning-for
-
unreacha
b
l
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
ge branch 'pt
/
pull-tests' into
ne
x
t
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Merge branc
h
'sb/glossary-submo
d
ule' into next
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio
C Ha
m
a
n
o
Merge branch 'sb/submodul
e
-doc-intro' into next
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o
C
Haman
o
M
e
rg
e
branch 'jk
/
d
i
a
g
nos
e
-config-mmap
-
failure'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hama
n
o
Mer
g
e branch
'mt/p4-d
e
potFile-at-versi
o
n' int
o
n
e
xt
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
br
a
n
ch
'
m
h/verify-lock-e
r
ror-report' into
next
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
amano
Merge
b
r
a
nch 'jk/color-
d
iff-plai
n
-is-conte
x
t' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Haman
o
Merge b
r
a
n
c
h
'jk
/
c
lone-d
i
ssociate'
into next
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
a
m
a
no
Mer
g
e bran
c
h 'jc/diff-ws-err
o
r-highlight' into
n
ex
t
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
Sixth batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
M
e
rge branch 'sb/tes
t
-bitma
p
-free-at-e
n
d'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C
H
amano
Merge branc
h
'mm/
r
e
base-i-po
s
t-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
J
u
ni
o
C Hamano
Merge br
a
nch 'fm/fetch-ra
w
-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
mano
M
erge branch 'sg/help-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
M
e
rge bran
c
h 'mm
/
log-format-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'dt/ca
t
-f
i
le-
f
ollow-sym
l
inks'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
a
man
o
M
e
rge branch 'rs/janitorial'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C
H
am
a
no
Merge b
r
anc
h
'jk/stash-opt
i
ons
'
commit
|
commitdiff
|
tree
2015-06-01
J
un
i
o
C
Hamano
Merge branch
'
da/mergeto
o
l-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o C Hamano
M
erge bra
n
c
h
'mc/commit
-
doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch '
j
h/filter
-
e
m
pty-contents'
commit
|
commitdiff
|
tree
2015-06-01
J
un
i
o C Hama
n
o
Merge branc
h
'ah/usag
e
-strings'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C
Hamano
Me
r
ge branch
'
jk/h
t
tp-backend-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
J
unio
C
Hamano
Merge branch 'dt/clean-p
a
t
h
spec-f
i
l
ter-then-lstat'
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
s
u
ppre
s
s err
o
rs on mis
s
ing UNINT
E
RESTING links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
silenc
e
b
roken
link warnings with re
v
s
-
>ignore_missing
_
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jef
f
King
add quieter versions
of parse_{t
r
ee,commit}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Thomas Braun
completion: sug
g
est sequencer
command
s
for
r
evert
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Stefan Beller
gl
o
s
s
a
ry: add "rem
o
te
"
, "submodule
"
, "supe
r
project"
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
J
ef
f
K
ing
set
u
p_git_directory:
d
elay core
.
bar
e
/c
o
re
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile: sile
n
ce perl/PM
.
stamp recipe
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff
King
Makefil
e
: avo
i
d t
i
m
estamp
u
pdate
s
t
o
GI
T
-BUI
L
D
-OPTIONS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Ma
k
efile: drop depende
n
cy between git-in
s
taweb and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
u
l
Tan
t5520
:
c
heck reflog ac
t
ion in fas
t
-forw
a
r
d mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
1:
test
-
-
dry-run does not make any changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520:
t
est --rebase failure on unbo
r
n branch with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: tes
t
--r
e
base with multiple
branch
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul Tan
t5520:
test work
t
ree fast-forwa
r
d when fe
t
ch updates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test for
f
ailure if
i
ndex has
u
nresolved entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Stefan Be
l
l
e
r
submodule doc:
reorder in
t
roductory paragraphs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
u
nio C Hama
n
o
Merge br
a
nch 'ah/usage-st
r
ing
s
' into next
commit
|
commitdiff
|
tree
2015-05-28
Junio C Hamano
M
e
rge
b
ranch '
j
c/merge-drop-old-syntax' into next
commit
|
commitdiff
|
tree
2015-05-28
Junio C Hamano
Merge bran
c
h
'l
d
/p4-e
d
i
t
o
r-mu
l
ti-words' into next
commit
|
commitdiff
|
tree
2015-05-28
SZEDER Gá
b
or
Documen
t
ation: include 'merge
.
bran
c
hdesc'
f
o
r
m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
u
n
i
o C Hamano
xmm
a
p():
d
rop "Out
of memory?"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff Ki
n
g
config
.
c: r
e
wr
i
te ENO
D
EV i
n
t
o EISDIR
w
hen mmap f
a
ils
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
e
ff Ki
n
g
config
.
c: avoid x
m
ma
p
error
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c: fix
mmap l
e
ak when w
r
itin
g
co
n
fig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
read-ca
c
he
.
c:
d
rop PROT_
W
RI
T
E from mmap
o
f
i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torr
o
j
a
p4:
r
et
r
ieve the right revision of the file in UTF
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
i
chael Hagge
r
ty
ref_transacti
o
n_commit(): do not capitali
z
e e
r
ror
m
essag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
ichael Haggerty
verify_lock()
:
do not
capi
t
alize error
m
essag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
verify_lock(): report
e
rror
s
via
a strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C H
a
man
o
Sync
with m
a
st
e
r
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff King
d
i
f
f
.
h: rename DIFF_P
L
AIN colo
r
slot
t
o DIFF_CONTEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f King
dif
f
:
acc
e
pt color
.
diff
.
context as
a
synonym
f
or "plain"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C Hamano
Merge br
a
n
ch 'nd/un
t
r
a
c
k
ed-cache'
commit
|
commitdiff
|
tree
next