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 'jk/die-on-bogus-worktree-late'
2015-06-16
Junio
C Ha
m
ano
Merge
b
r
a
nch 'jk/die-
o
n
-
bogu
s
-worktree-late'
commit
|
commitdiff
|
tree
2015-06-16
Juni
o
C Hamano
Merge bra
n
c
h 'sg/merge-summary-config'
commit
|
commitdiff
|
tree
2015-06-16
J
unio C Hama
n
o
Merge branch 'ah
/
send-e
m
ai
l
-se
n
d
m
ai
l
-alias'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
H
amano
Sec
o
nd hal
f
of s
e
venth bat
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-11
Junio C
Hamano
Merge branch 'tb/complete-s
e
q
uencing'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hamano
Me
r
ge branch 'j
k
/sque
l
ch-missi
n
g-link
-
w
a
rni
n
g
-
for-
u
nreachable'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch 'pt/pull-tests'
commit
|
commitdiff
|
tree
2015-06-11
J
unio
C
Ha
m
ano
Merge branch 'sb/gloss
a
ry-submodul
e
'
commit
|
commitdiff
|
tree
2015-06-11
J
un
i
o C H
a
mano
Me
r
ge
b
ranch
'sb/s
u
bmodule-doc-intr
o
'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio C Hamano
Merge
b
ranc
h
'jk/d
i
a
g
nose
-
config
-
mmap-failure
'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hamano
Merge br
a
n
ch 'mt/p4-depotFile-a
t
-version'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
M
e
rge branch 'mh/ve
r
i
fy-lock
-
error-rep
o
rt'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hamano
Merge b
r
anch 'jk/color
-
di
f
f-plain-is-contex
t
'
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C Hama
n
o
Merge branch 'jk/clone-dissociate'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
H
amano
Merge branch 'jc/diff-ws-er
r
o
r
-highl
i
gh
t
'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Ha
m
ano
S
ync with
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
The first
h
alf of
t
h
e
s
e
venth batch
f
o
r 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C H
a
mano
Merge
br
a
nch 'l
d
/p4-editor-mul
t
i
-w
o
rds'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge bra
n
ch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C H
a
mano
Merge branch 'j
k
/
at-p
u
s
h-sha1
'
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C Haman
o
Merge br
a
nch 'dl/
b
r
a
nch-error
-
mes
s
a
ge' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C H
a
mano
Merge bra
n
ch 'jk/skip-http-test
s
-under-no-curl' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C
Haman
o
Merge b
r
anch
'
ps/doc-p
a
ckfile-vs-pack-file' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge
b
ra
n
c
h 'fg/docum
e
nt-
c
ommit-message-stri
p
pi
n
g
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merg
e
branch
'
jk/rerere-
f
org
e
t-check-
e
nabl
e
d
' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'pt/pull-log-
n
' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch
'
pt/p
u
ll-f
f
-vs-mer
g
e-f
f
' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Mer
g
e branch 'rs/p
l
ug-leak-in-pack-bitmaps' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
un
i
o C Hamano
Me
r
ge branch 'ja/tutorial-asciidoctor-fix
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
r
a
n
ch '
j
k
/stripspac
e
-
a
s
c
ii
d
o
c
tor-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'j
k
/asciidoc-markup-fix' into main
t
commit
|
commitdiff
|
tree
2015-06-05
J
unio
C
Hamano
Merge branch 'ps/b
u
ndle-verify-
a
rg' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'mh/wr
i
te
-
refs-sooner-2
.
4' into
m
ain
t
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
M
e
rg
e
b
ranch 'mh/ref-
d
irec
t
ory-f
i
le
'
in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hama
n
o
M
erge branc
h
'mg/log-decora
t
e-HE
A
D' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio
C
Hamano
M
erge b
r
a
n
ch
'
sb/t1020-
c
l
eanup' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Ham
a
no
Merge branch '
j
c/
g
itigno
r
e
-precedence' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
a
n
ch 'bc
/
conne
c
t-plink' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch '
p
h
/rebase-i-redo' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch 'jk/add
-
e-
k
i
l
l-editor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erg
e
branch '
m
h/clone-ver
b
osit
y
-fix'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'jk/sha1-file
-
reduce-useless-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branc
h
'tb/bl
a
me-resurrect-con
v
e
rt
-
to-git' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Ham
a
n
o
Merge branch 'jc/plu
g
-
f
mt-
m
erg
e
-msg-leak'
into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
M
erge branch 'pt/xdg-config
-
path' into m
a
int
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
S
i
xth batch for 2
.
5 c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch
'sb/
t
est-bitmap-f
r
e
e-a
t
-
e
n
d
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge
bran
c
h
'
mm/rebase-i-post-re
w
rite-exe
c
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hama
n
o
Mer
g
e branch
'
fm/fetch-r
a
w-sha1'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hama
n
o
Merge branch 'sg
/
help-grou
p
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merg
e
b
r
anch 'mm/
l
og-format-raw-doc
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge
branch 'dt/cat-file-follow-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
M
e
rge b
r
anch 'rs/
j
a
n
i
torial'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C
H
a
mano
Merg
e
b
r
anch 'jk/stash-
o
ptions'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Ham
a
no
Merge
b
ranch 'da/mergetool-w
i
nmerge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge bra
n
ch 'mc/commit-doc-gram
m
ofix
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'jh/filter-
e
mpt
y
-
c
onte
n
ts'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
erge branch 'ah/u
s
age-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Haman
o
Me
r
ge branch '
j
k/http-back
e
nd-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o
C
Ha
m
ano
Merge
b
ra
n
ch
'
dt/clean-pathspec-filter-then-ls
t
at'
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
suppr
e
ss
e
r
rors on m
i
ssin
g
UNIN
T
E
R
E
STING l
i
nks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff
King
silence b
r
oken link warnings with
r
evs->ignore_missing_
l
i
n
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
add quieter versions
of p
a
r
se_{tr
e
e,co
m
m
it}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Th
o
mas Braun
c
o
mpletio
n
: suggest sequencer commands f
o
r revert
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Stefan Beller
gl
o
ssary: add
"
remote
"
, "submodule", "
s
uperproject
"
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
setup_git_
d
i
re
c
tory: dela
y
co
r
e
.
bare
/
core
.
w
o
rktree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t5520:
c
h
eck reflog action in fast-forwar
d
m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t5521: te
s
t --dry-run does no
t
make any ch
a
nges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5
520
:
test --
r
e
base failure on un
b
or
n
branch with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t
552
0
: test --r
e
base with m
u
l
tiple br
a
nches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t5520
:
test work t
r
e
e
fast
-
forward when f
e
tch upd
a
tes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t5
5
20:
test for
f
ailur
e
i
f index has unre
s
olved e
n
tries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Ste
f
an Beller
submodu
l
e do
c
:
r
eor
d
er introd
u
ctory para
g
ra
p
hs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
S
Z
E
DER
G
áb
o
r
Document
a
tion: i
n
clude 'merge
.
branchdesc' for merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
J
unio C Hamano
xmmap()
:
dr
o
p "Out of memory?"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff
King
c
o
n
fig
.
c: rewrite ENODEV
in
t
o
EISDIR when mmap f
a
i
ls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
conf
i
g
.
c: av
o
id xmmap error me
s
s
a
g
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Je
f
f King
co
n
fi
g
.
c:
fix mmap leak w
h
en writing
conf
i
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
rea
d
-cache
.
c:
d
rop
PROT_WRITE fr
o
m mmap
of
i
ndex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torr
o
ja
p
4: re
t
rieve t
h
e right
r
ev
i
s
i
o
n of the file
in U
T
F
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ael Hagg
e
rt
y
re
f
_transact
i
on
_
commit()
:
do not
c
apitaliz
e
error m
e
s
sages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ael Haggerty
verify_lock(): do not capitalize error
m
e
ssages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Hagge
r
ty
verify_
l
o
ck():
r
e
port
e
rrors via a strb
u
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
King
diff
.
h: rename DIFF_PLAIN co
l
or slot to DIFF_
C
ONTE
X
T
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff: a
c
cept color
.
diff
.
context as
a synonym for
"plain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hama
n
o
Me
r
ge branch 'nd/untracked-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7063:
h
i
de
stderr from setup inside pre
r
eq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
unio C Hama
n
o
t
9001:
write $HOME/, not ~/, to help shells without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
A
l
len Hubbe
send-email
:
add sendmai
l
emai
l
a
liases fo
r
mat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
veri
f
y_lock(): on e
r
ror
s
,
let
t
he caller
u
nlo
c
k the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
verify_lock
(
): retu
r
n
0/
-
1 rat
h
er than str
u
ct ref_lo
c
k
*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
King
clone: reorder -
-
dissociate a
n
d
-
-
reference
o
p
t
ion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
c
lone: use
O
PT_STRING_L
I
ST fo
r
--
r
efere
n
ce
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
u
nio C Hamano
d
i
ff
.
c:
--ws-error-highli
g
ht=<kind>
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
unio
C Hamano
diff
.
c
:
add em
i
t_
d
el
_
line
(
) and em
i
t_c
o
ntext_line
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
n
o
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
G
it 2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
M
erge branch 'j
k
/still-in
t
e
resting' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
H
a
ma
n
o
Merge b
r
anch 'jc/hash-obje
c
t
'
into maint
commit
|
commitdiff
|
tree
next