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 Hamano
Merge b
r
anch '
j
k/die
-
on-bogu
s
-worktree-la
t
e'
commit
|
commitdiff
|
tree
2015-06-16
Junio
C Hamano
Merge branch 'sg/merge-
s
ummary-co
n
fig'
commit
|
commitdiff
|
tree
2015-06-16
Juni
o
C
Hamano
Merge branch 'ah/send
-
email-sendmail-a
l
ias'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
H
amano
S
e
cond
half of seventh batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch
'
tb/complete-sequencing'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C Ham
a
no
Me
r
g
e
branch 'jk/squelch-missing-link-warning-f
o
r-unreachable'
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C H
a
man
o
Merge branch
'pt/pul
l
-te
s
ts'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge
bra
n
ch 's
b
/glo
s
sary-submodule
'
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C H
a
mano
Merge branch 'sb/submodule-doc-int
r
o'
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o
C Hamano
M
e
rge br
a
n
ch 'jk/diagnose-config-mmap-failure
'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
M
e
rg
e
b
ranch 'mt/p4
-
dep
o
t
F
ile-at-ve
r
sion'
commit
|
commitdiff
|
tree
2015-06-11
J
u
n
io C Hamano
Merge branch 'mh/verify-lock-error-repor
t
'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Ham
a
no
Me
r
g
e branch 'jk/c
o
lor-diff
-
p
l
a
in-is-co
n
text
'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge bran
c
h
'
jk/clone-dissociate'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Haman
o
M
e
r
g
e branch 'jc/
d
iff-ws-error-highlight'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
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
Ju
n
io C
H
amano
The first ha
l
f of the seventh batch
for
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Haman
o
Merge branch '
l
d/p4-
e
ditor-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'bc/object-
i
d'
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C Ham
a
no
Merge branch
'
j
k
/at-pus
h
-sh
a
1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge
branch
'
d
l/branch-error-me
s
sage' i
n
to
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
H
aman
o
Merg
e
bran
c
h 'jk
/
skip-
h
ttp-test
s
-under-no-curl' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
M
e
rge br
a
nch 'ps/doc-p
a
c
k
file-vs-pack-file
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge branch 'fg/docu
m
e
n
t-co
m
mit-me
s
sage-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
M
e
r
g
e br
a
nch 'j
k
/
r
er
e
re-f
o
rget-check-enabled' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
man
o
Merge branch 'pt/pull-log-n' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Mer
g
e
b
ranch
'
p
t
/
p
ull-ff-vs-merg
e
-f
f
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C H
a
man
o
Merge br
a
nch 'rs/plug-leak-in-pack-bitmaps' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Ham
a
no
Merge
b
r
a
nch 'j
a
/tuto
r
ial-
a
sci
i
doctor-fix' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hama
n
o
Mer
g
e
b
ranch '
j
k/stripspac
e
-asciidoctor-fix' in
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merg
e
br
a
n
c
h 'jk
/
asciidoc-m
a
r
kup-
f
ix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge
b
r
anch
'
ps
/
bund
l
e
-verif
y
-a
r
g' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch 'mh/write-refs-soon
e
r-2
.
4' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch 'mh
/
ref-direc
t
ory-fi
l
e' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ranch 'mg/log-dec
o
rate-HE
A
D' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
M
erge branch 'sb/t1020-cl
e
anup'
in
t
o m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
H
a
mano
Merge
b
ranch 'jc/gitign
o
r
e
-prec
e
dence'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
amano
Merge branch 'bc/connect-plink' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
n
o
Merg
e
branch 'ph/reba
s
e-i-redo' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge b
r
anch 'jk/a
d
d
-
e-kill-editor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Merge bra
n
ch
'mh/clone-
v
erbosity-fi
x
' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C H
a
mano
Merge branch 'jk
/
sh
a
1-fil
e
-reduce-u
s
e
le
s
s-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ranc
h
'tb/blame-
r
esu
r
r
ect-convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C
Ham
a
n
o
M
erge branc
h
'jc/p
l
u
g
-f
m
t-merge-msg-leak' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
m
a
no
Merge branc
h
'pt/xdg-config-path' into maint
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Sixth batch f
o
r 2
.
5 c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio
C
Hama
n
o
Mer
g
e
b
ranch
'sb/
t
est-bit
m
ap-
f
r
e
e-
a
t-end
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio
C
Haman
o
M
erge branch 'mm/rebase-i-post-rewrite
-
exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch 'fm/f
e
tch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge
branch 'sg/help-g
r
o
u
p
'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge
b
ranch 'mm/log-format-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge bran
c
h 'dt/cat-file-fo
l
low-sy
m
li
n
ks'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o
C
H
amano
Merge br
a
n
c
h 'rs/janitorial
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch
'jk/
s
tash-options'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Haman
o
Merge branch 'da
/
mer
g
etool-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io
C
Hamano
Merge bran
c
h 'mc/commit-doc
-
gram
m
ofix
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
man
o
M
erge branch 'jh/fi
l
ter
-
em
p
ty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Ha
m
ano
M
e
r
ge branc
h
'ah/
u
s
a
ge-strings'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o
C H
a
ma
n
o
Merge
b
ranc
h
'jk/http-backend-deadl
o
ck'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o C
Hamano
M
erg
e
branch '
d
t
/clean-pathspec
-
filter-
t
hen-lstat'
commit
|
commitdiff
|
tree
2015-06-01
J
e
ff King
suppress errors on
mis
s
ing UNINTERESTI
N
G
l
inks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
e
f
f
King
si
l
en
c
e broken link warnings
with
revs->ignor
e
_
missing_links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff
King
add quieter v
e
rsions
o
f
p
ar
s
e
_
{tree
,
commit}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
T
h
o
mas B
r
aun
completion
:
sugges
t
s
eq
u
encer commands for revert
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Stefan Beller
glossary: add
"
rem
o
te", "submodule", "s
u
perp
r
oject
"
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_directory: delay core
.
bare/core
.
work
t
ree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t5520: che
c
k reflog action in fast-forward merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5521:
t
est
-
-dry-run
d
o
es not make any
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5520:
t
est --rebase fai
l
ure on unborn branch wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t5520: test --rebase with multiple branc
h
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5520:
test work
t
ree fast
-
forward
whe
n
fetch
u
pdates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul
Tan
t55
2
0: tes
t
f
or f
a
ilure if index has u
n
r
e
solved entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
S
t
efa
n
Be
l
le
r
submo
d
ule do
c
: reo
r
der introductory paragr
a
phs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
SZEDER Gábor
D
ocumentation: inclu
d
e
'
merge
.
b
r
anch
d
esc' for mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Junio C Hamano
xmmap(
)
:
d
rop "
O
ut of memory?"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
conf
i
g
.
c:
r
ewrite ENODEV into EISDIR
when
mmap fail
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
e
ff Ki
n
g
confi
g
.
c: avoid x
m
map erro
r
m
essages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c: fix mmap leak w
h
en w
r
iting config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
read-cache
.
c: drop PROT_WRITE f
r
om mmap of index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Miguel T
o
rroja
p
4
:
retrie
v
e
the
right revision
o
f the file i
n
UTF
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Ha
g
gerty
r
e
f_transaction_commit
(
):
do
not ca
p
italize err
o
r m
e
ssages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Micha
e
l
Hagge
r
t
y
verify_lock():
do
n
ot capita
l
ize error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ael Haggerty
v
e
r
i
fy_
l
ock(): r
e
port errors via a str
b
uf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff
.
h: rename DIFF_PLAI
N
color slot t
o
DIFF_CONTEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff:
a
ccept 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 Haman
o
M
erge
bran
c
h 'n
d
/
u
ntracked-cache'
commit
|
commitdiff
|
tree
2015-05-27
J
eff King
t
7063: hi
d
e std
e
rr from setup
i
nside
prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
t
900
1
: write $HOME/, not ~/, to he
l
p shells wit
h
o
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Allen Hubbe
send-email:
add sendmail email alias
e
s
f
o
r
m
at
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael H
a
gge
r
ty
verify_lock
(
): on
e
r
rors,
let
t
he caller unloc
k
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
i
c
h
a
e
l
Haggerty
v
e
rify
_
lock
(
)
: return 0/
-
1 rather than struct ref
_
l
ock
*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone
:
reorder --dissociate and --refe
r
enc
e
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone: us
e
OPT_STRIN
G
_
L
IST for
--refer
e
n
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C H
a
mano
di
f
f
.
c
:
--
w
s-error-high
l
igh
t
=<kind> option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
unio C
Hamano
dif
f
.
c: add emit_del_line() and emit_context_li
n
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
a
n
o
Sync w
i
th
2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e bra
n
ch 'jk/still-int
e
resting' into
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C
H
amano
Me
r
ge branc
h
'jc/has
h
-
o
bject' into mai
n
t
commit
|
commitdiff
|
tree
next