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 'jc/apply-reject-noop-hunk' into next
2015-06-11
Ju
n
io
C Hama
n
o
Merge branch 'jc/ap
p
l
y
-
rej
e
ct-noop-hunk' into next
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
Hamano
Sync with mast
e
r
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Ha
m
ano
Sync with
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio 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 Hamano
The firs
t
half of the se
v
enth batch fo
r
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
m
ano
Merge branch 'ld/p4-ed
i
t
or-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
M
erge branch
'bc/obje
c
t-id'
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branch 'jk/at-push-sha
1
'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'd
l
/branch-e
r
ror-me
s
s
age'
into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
M
erge branch
'
jk/skip-http-t
e
sts-unde
r
-no-cur
l
' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
branch 'ps/doc-packf
i
le-v
s
-pack-file' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Haman
o
Merg
e
bra
n
ch 'fg/docu
m
e
nt-commi
t
-mes
s
a
g
e
-
st
r
ippin
g
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
ma
n
o
Mer
g
e
branch '
j
k/r
e
rere-forget-
c
h
e
ck-enabled' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io
C Hama
n
o
Merge branch
'
pt/pul
l
-log-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C
Haman
o
Merge b
r
a
nch 'pt/pull-ff-v
s
-merge-f
f
' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Ham
a
no
M
e
rge b
r
anch 'rs/p
l
u
g
-l
e
ak-in-pack-bitmap
s
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge bran
c
h 'ja/tu
t
orial-asciidoc
t
o
r
-fix' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hama
n
o
Mer
g
e branch 'jk/stripspa
c
e-asciidoctor-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ranc
h
'jk/asci
i
doc-markup-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C H
a
m
ano
Merge branch
'ps/bun
d
le-
v
erify-arg' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e b
r
anch 'mh/writ
e
-refs
-
soon
e
r-2
.
4' in
t
o m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Ham
a
no
Merge
branch 'mh/ref
-
directory
-
file'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge b
r
anch
'
m
g/log-decora
t
e-HEAD' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'sb/t
1
020
-
cl
e
anup' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge
b
ranch 'jc/
g
itignore-
p
recedence' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'bc
/
conn
e
ct-plink' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C
H
amano
Merge br
a
nch 'ph/rebase-i-redo
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hama
n
o
M
erge br
a
nch 'jk/add-
e
-kill-editor'
into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branc
h
'mh/clo
n
e-verb
o
sity-
f
ix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
aman
o
Merg
e
branc
h
'jk/
s
ha1-file-reduce-usel
e
ss-warnin
g
s
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge branch 'tb/
b
lame-r
e
s
u
rre
c
t-co
n
v
e
rt-
t
o-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bra
n
ch 'jc/plug-fmt-merge-msg-leak' in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch
'pt/xdg-config-pat
h
' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-04
Juni
o
C Haman
o
Merge b
r
anc
h
'nd/slim-index
-
pack-memory-usage' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
Junio C
Haman
o
Merge
branch 'sb/pack
-
protocol-me
n
tion-sm
a
rt-http
'
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
Junio C
Hamano
Merge branch 'jk/make-fix-d
e
p
endencie
s
'
into next
commit
|
commitdiff
|
tree
2015-06-04
Junio
C Hamano
Merge branc
h
'jk/die-on-bogus-worktree-late' into next
commit
|
commitdiff
|
tree
2015-06-04
Junio C H
a
m
a
no
Merge
b
r
anch 'sg/m
e
rge-summ
a
ry-config
'
into
next
commit
|
commitdiff
|
tree
2015-06-04
Junio C Hamano
Merge
branch 'ah/s
e
nd-email-sendma
i
l-alias' into next
commit
|
commitdiff
|
tree
2015-06-04
Jef
f
K
i
ng
index
-
p
a
ck: fix t
r
uncat
i
on of off_t in c
o
mparison
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Stefan Belle
r
Documentati
o
n/tech
n
ical/pack-protocol: ment
i
on http
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io
C Hamano
S
y
n
c with master
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
r
ge bra
n
ch '
t
b/complete-sequenci
n
g' into nex
t
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
an
o
Merge branch 'jk/squelch-missing-link-w
a
rning-for-unreac
h
abl
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge
b
r
anch 'pt/pull-test
s
'
i
nto next
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
mano
Merg
e
b
r
a
nch 'sb
/
glos
s
ary-s
u
bmod
u
le' into next
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Me
r
ge branch 's
b
/submod
u
le-doc-intro' into nex
t
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
M
erg
e
branch
'j
k
/diagnose-config-mmap-failu
r
e' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'mt/p4-
d
epotFile-at-versio
n
' int
o
ne
x
t
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
M
e
r
g
e b
r
a
n
c
h
'mh/verify-lock-e
r
ror-report' into next
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge b
r
anch
'
jk/color-dif
f
-plain-is-context' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merg
e
b
ranch
'jk/c
l
o
ne-
d
is
s
ociate
'
into nex
t
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge branch 'j
c
/diff-ws-er
r
o
r
-highlight'
i
n
t
o next
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Sixth ba
t
ch
f
or 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o
C
H
a
m
ano
M
erge
branch 'sb/test-
b
itmap-fre
e
-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
n
o
Merge branch 'mm/rebase-i-p
o
s
t
-
rewri
t
e-exe
c
'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
M
e
rge branch 'fm/fetch-raw-sha1
'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Ha
m
a
no
Merge bran
c
h '
s
g/help-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge
branch 'mm/log-format-raw
-
doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
a
no
M
er
g
e
branch 'dt/cat-
f
i
le-fol
l
ow-sy
m
links'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
M
e
r
g
e branch 'rs/
j
a
n
itorial'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge
b
ranch 'jk/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
Merge branch 'da/mergetool-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o C Ham
a
no
Me
r
ge branch 'mc/commit-do
c
-
grammofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
branch 'jh/fi
l
ter
-
empty-
c
o
n
t
ents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
M
erge branch 'ah/us
a
ge-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Me
r
ge br
a
nch 'j
k
/
ht
t
p-backend-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Ha
m
ano
Merge b
r
a
n
ch 'dt/clean-
p
a
t
h
s
pec
-
f
ilter-then-lstat'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
apply: reject a hunk that
does not do an
y
thing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jef
f
King
s
uppress errors
on missing UNINTERESTI
N
G links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff
Ki
n
g
silence broken link warning
s
with revs->
i
gno
r
e_mi
s
sing_links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
add
q
uieter versions of
parse_{tree,commit}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Thomas Braun
c
o
m
pletion:
suggest sequencer commands for revert
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Stefan Beller
gloss
a
r
y
: add "re
m
ote", "su
b
module",
"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
Jeff Ki
n
g
setu
p
_git_directory: delay core
.
bare/cor
e
.
w
o
r
k
tree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
J
eff King
Makefile: s
i
lence perl/PM
.
s
tamp
r
e
c
i
pe
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
J
e
ff Ki
n
g
Makef
i
le: avoid timestamp updates to GIT-B
U
ILD-O
P
TIONS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Make
f
il
e
:
d
r
o
p dependency bet
w
een g
i
t-instawe
b
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t552
0
:
check reflog
actio
n
in
f
a
st-forward merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5521:
t
est --d
r
y-run does not make any chan
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: t
e
st
--reb
a
se
f
a
il
u
r
e on
unbo
r
n
b
ra
n
ch w
i
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520: test -
-
rebase with multiple b
r
anche
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l
Ta
n
t5520: test work tree fast-forward when fetc
h
upd
a
t
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t5
5
20: t
e
st for failure
i
f in
d
e
x
h
a
s unresolve
d
entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Stefan Beller
submodul
e
doc: r
e
order
int
r
oduct
o
ry paragraph
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Ju
n
i
o
C Hamano
Merge branch
'
ah/usage-strings'
into next
commit
|
commitdiff
|
tree
2015-05-28
J
unio C Hamano
M
e
rge branch
'jc/merge-drop-old-syntax' into next
commit
|
commitdiff
|
tree
2015-05-28
J
u
nio C Hamano
Mer
g
e
b
ranch
'
l
d/p4-editor
-
multi
-
words' into
n
ex
t
commit
|
commitdiff
|
tree
2015-05-28
S
Z
EDER
G
ábor
Do
c
u
ment
a
tion: include 'merge
.
branchdes
c
' for
m
er
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jun
i
o C Hamano
xmmap()
:
drop "Out of me
m
o
r
y?"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c: rewrite EN
O
DEV into
E
ISDIR w
h
en
m
m
ap
f
ails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Je
f
f
King
config
.
c: avoid
x
mmap err
o
r
messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
J
eff King
c
o
n
fig
.
c:
fi
x
mmap
leak whe
n
writing config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff
K
ing
read-
c
ache
.
c: drop PROT_WRITE from
mma
p
o
f
ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torroja
p4
:
retriev
e
the r
i
ght revision of the fi
l
e
i
n
U
T
F
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael H
a
ggert
y
ref_tra
n
sa
c
t
ion_com
m
it
(
): do not ca
p
ita
l
ize err
o
r
m
e
ssages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael
H
aggerty
v
erify_lock(): do not capitaliz
e
error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
veri
f
y_l
o
ck(): repor
t
errors via a strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C
Hamano
Sync with master
commit
|
commitdiff
|
tree
2015-05-27
Jeff K
i
ng
diff
.
h: r
e
name DIFF_PLAIN color slot to DIFF_CONTEXT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next