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
J
unio
C Hamano
Merg
e
b
r
anch
'
jk/die-on-bogus-worktree-late'
commit
|
commitdiff
|
tree
2015-06-16
Jun
i
o C Ha
m
ano
Mer
g
e
bra
n
ch 'sg/
m
erg
e
-summary-con
f
ig'
commit
|
commitdiff
|
tree
2015-06-16
Ju
n
io
C Hamano
Merge branch 'ah/send-email-sendmail-alias'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio
C Hama
n
o
Second half of seventh batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C Hama
n
o
M
e
rge bran
c
h
'
tb/co
m
pl
e
te-sequencin
g
'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch 'jk/squelch-missin
g
-lin
k
-war
n
ing-fo
r
-unreachabl
e
'
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io C Ham
a
no
Merge
branch '
p
t/pull
-
tests'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hamano
Mer
g
e branch
'
s
b/glo
s
sary-submod
u
le'
commit
|
commitdiff
|
tree
2015-06-11
J
uni
o
C H
a
m
a
no
Merge branch
'sb/submo
d
ule-d
o
c-i
n
tro'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
H
amano
Merge bran
c
h 'jk/dia
g
nose-con
f
ig-mmap-
f
a
i
l
ure'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hama
n
o
Merge branch
'
mt/p4-depotFile-at-version'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio C
Ha
m
ano
Me
r
ge bra
n
ch 'mh/veri
f
y
-
lock-e
r
ror-rep
o
r
t'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Ham
a
no
Merge branch 'jk/color-diff-pla
i
n
-is-context'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branc
h
'jk/clone-dissociate'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge
branch 'jc/diff-w
s
-err
o
r-highlight'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
G
i
t 2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Th
e
first half of the
s
e
v
enth b
a
tch for
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
M
e
rge
branch 'ld/p4
-
edito
r
-multi
-
word
s
'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch '
b
c/object-id'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge branch 'jk/at-pus
h
-sha
1
'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
a
mano
Merge
b
ranc
h
'dl/branch-error-message' int
o
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
M
erge branch 'jk/s
k
ip-http-test
s
-un
d
er-no-c
u
rl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Haman
o
Merge br
a
n
c
h
'
ps/doc-pack
f
ile-vs-pack-file' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
Hamano
M
erg
e
branch '
f
g/doc
u
m
e
nt-commit-message-
s
trip
p
ing
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Mer
g
e branch 'jk/re
r
ere-forget-c
h
eck-
e
nabled' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge branc
h
'pt/pu
l
l
-
log-n' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Ha
m
ano
Merge branch 'pt/pull-ff-vs-merge-
f
f'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'rs/plug-leak-in-pack-bitm
a
p
s
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
M
erge
branch 'ja/tutorial-asc
i
idoc
t
or-fix'
i
nto m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ranch 'jk/s
t
ripspace-asciidoctor-fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge
b
ranch '
j
k/asciidoc
-
m
a
rk
u
p-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
bra
n
c
h 'ps/bundle-verify-arg' int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Ha
m
a
no
Merge branch 'mh
/
write-refs-soon
e
r-2
.
4' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'mh/re
f
-d
i
rectory-file' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch 'mg/log-deco
r
ate-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'sb/
t
1020-cle
a
nup' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
M
erge branch 'jc/giti
g
nore
-
precedence'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'bc/connect-pl
i
nk' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge
branch 'ph
/
rebase-i-redo'
i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
M
e
rge branch
'j
k
/add-e-ki
l
l-edi
t
or' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Merge
b
ranch
'mh/clone-verbosity-fix'
i
nt
o
ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch 'jk/sh
a
1-file-redu
c
e-use
l
e
ss-war
n
ings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge branc
h
'tb/bl
a
me
-
resurrect-conv
e
rt-to
-
g
it'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
ma
n
o
Merg
e
br
a
nch 'jc
/
plu
g
-fm
t
-merg
e
-msg
-
l
e
a
k
' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch 'p
t
/xdg-c
o
nfig-p
a
th
'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Sixt
h
batch for 2
.
5
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Merge br
a
nch 's
b
/
test-bi
t
map-free-at-end
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Ham
a
no
Merge branch 'mm/rebase-i-p
o
st-rewr
i
te-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'fm/fetch-raw
-
sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge branch 'sg/hel
p
-
g
r
oup'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch 'mm/log-
f
ormat-
r
aw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge
branch 'dt/cat-f
i
le-fo
l
low-symlink
s
'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C
H
a
mano
Merge branch '
r
s/janitori
a
l'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Me
r
ge
b
ran
c
h 'jk/stash
-
o
p
t
i
on
s
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Merge branch
'da/
m
ergetoo
l
-winmerge
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
b
ranch 'mc/com
m
i
t-d
o
c
-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
r
ge
branch 'j
h
/f
i
lt
e
r-empty-co
n
tents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Me
r
ge
branch
'ah/
u
s
age-strings'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merg
e
b
ranc
h
'jk/http-
b
ackend-deadl
o
ck'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch 'dt/clean-paths
p
ec-filter-then-lstat
'
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
suppress
er
r
ors on
m
i
ssi
n
g UNI
N
TE
R
ESTING links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
eff King
silence broken li
n
k warnings with rev
s
->ign
o
re_m
i
ssin
g
_li
n
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff
King
add
q
uiet
e
r version
s
of
par
s
e_{tree,commi
t
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Thomas Braun
completion: su
g
ges
t
sequence
r
commands for rev
e
r
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
S
t
e
f
an Beller
gloss
a
ry: add "
r
emote", "submodule", "sup
e
rproject"
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
_
g
i
t_directory: delay core
.
ba
r
e/core
.
w
o
rktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: check reflog act
i
on
i
n fast-forward merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
55
2
1: test --
d
ry-run does not make any changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t552
0
: test --rebase
f
ai
l
ure
on u
n
born branch with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520:
t
e
st --
r
eba
s
e with multi
p
le branche
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t
5
52
0
:
test work
t
ree
fast-forward wh
e
n fet
c
h updates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t
5
520:
t
est for failu
r
e
if
i
ndex has unresol
v
ed ent
r
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Stefan Bel
l
er
su
b
module d
o
c:
reor
d
er in
t
r
o
d
uctory paragraphs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
S
Z
EDER Gábor
Docu
m
e
n
t
ation:
include
'
m
erg
e
.
branchdesc'
for me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jun
i
o
C
H
ama
n
o
xmmap(): drop "Out
o
f
memor
y
?"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff Kin
g
config
.
c: rewr
i
t
e E
N
ODEV
i
nto EISD
I
R when m
m
ap fai
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff Kin
g
config
.
c: avoid xmmap error messag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff
King
config
.
c: fix mmap leak when wri
t
ing confi
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
read-cache
.
c: drop P
R
OT_WRITE fr
o
m mm
a
p of ind
e
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Miguel
T
o
r
r
o
j
a
p4: retrieve the right revision of the file in
U
T
F
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
i
c
hael Haggerty
ref_transaction_
c
ommit(): do not capital
i
ze er
r
or me
s
sages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mi
c
hael Haggerty
verify_l
o
ck(): do
n
o
t
c
a
p
i
talize error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael
H
ag
g
erty
verify_l
o
ck():
r
e
p
or
t
errors via a strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
di
f
f
.
h:
r
en
a
m
e DIFF_PLA
I
N col
o
r
s
lot to
DIFF_CONTEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff: acc
e
pt color
.
diff
.
conte
x
t as a synon
y
m
f
o
r "pl
a
in"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
u
n
io C Hamano
Merg
e
branch '
n
d/u
n
track
e
d-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff Kin
g
t7063:
hide stder
r
fro
m
setup inside
p
rereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jun
i
o
C
H
a
mano
t
9001:
write $HOME/, not ~/,
to h
e
l
p sh
e
l
ls wit
h
out
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
A
l
len Hubbe
sen
d
-
email: add se
n
dm
a
il email aliases
fo
r
mat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
ichael Haggerty
verify_lo
c
k(): on errors,
l
e
t
the caller unlock the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ael Haggerty
veri
f
y_lock(): return 0/
-
1 r
a
ther than struct ref_lock *
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone: reorder --dissociate and --r
e
fere
n
c
e
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
c
lone: use O
P
T
_
STRING_
L
I
ST for --reference
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C
Hamano
diff
.
c: --ws
-
error-hi
g
hlight=<k
i
nd>
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C
H
a
m
an
o
dif
f
.
c: a
d
d em
i
t_de
l
_line
(
) and emit_context_l
i
ne()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C H
a
m
an
o
G
i
t 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk/still-intere
s
ting' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Me
r
ge branch
'
j
c/hash-obje
c
t' in
t
o
maint
commit
|
commitdiff
|
tree
next