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/stash-require-clean-index'
2015-06-05
J
u
nio C
Hamano
Merge branch
'
rs/plug-
l
eak-in
-
p
a
ck-bitmaps'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Merg
e
b
r
a
nch
'
ja/tutori
a
l
-asci
i
docto
r
-fix
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge branch
'
jk/stripspace-asciidoctor-fi
x
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
M
erge branch
'
jk/asciidoc-
m
arkup-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branch
'ps/bundle-verify
-
arg'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge b
r
a
n
ch 'mh/write-refs-soon
e
r-2
.
4' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge br
a
nch 'mh/ref
-
directory-file' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Hamano
Merge branch 'mg/
l
og
-
decorate-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge br
a
nch
'sb/t10
2
0-cl
e
anup' into main
t
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branc
h
'jc/gitignore-precedence' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'bc/co
n
nec
t
-plink' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
m
a
no
Merg
e
bran
c
h 'ph/re
b
a
s
e-i-redo' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
Ham
a
no
M
er
g
e branch 'j
k
/add-e
-
kill-edit
o
r'
i
nto main
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C
H
ama
n
o
Merg
e
bra
n
ch 'mh/clone-verbosity-fix
'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'jk/sha1-file-reduce-u
s
eless
-
warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge branch 'tb/blame-resurrect-convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Mer
g
e branch '
j
c/plug-
f
mt-mer
g
e-msg-l
e
ak' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
uni
o
C Hamano
Merge branch 'pt
/
xd
g
-config-path' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-04
Junio
C
H
amano
l
l-me
r
ge: pass
t
he origina
l
pat
h
t
o
external
d
rive
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
R
e
m
i
Lespinet
git-am: ad
d
a
m
.
t
hreeWay config
variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Rem
i
Le
s
pinet
t4150-am: re
f
actor am -3 tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Remi Lespinet
git-am
.
sh: fix initializa
t
i
o
n of the threeway va
r
iable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Jeff King
index-pack: fix trunc
a
t
i
on of off_t in c
o
mparison
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Mic
h
a
e
l Haggerty
read_l
o
o
se_refs(): s
i
mpli
f
y
function log
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eric Sunshine
c
o
nfigure: add getdeli
m
()
c
h
eck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eric Suns
h
ine
config
.
ma
k
.
unam
e
: Darwin: defi
n
e HAVE_GE
T
DE
L
IM for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Jeff K
i
ng
ewah: use
less g
e
neric macro name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eric Su
n
shine
ewah/
b
it
m
ap: silence wa
r
n
i
n
g
a
b
out MASK m
a
cro redefinition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Stefan Beller
D
o
cumentation
/
technical
/
pac
k
-protoc
o
l: men
t
ion
http
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull
:
use git-rev-p
a
rs
e
--pa
r
seo
p
t for option parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: handl
e
gi
t
-fetch
'
s options as
well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
J
u
n
io C Hamano
M
erge
branch 'pt/pull-tests' into
pt/pull-op
t
parse
commit
|
commitdiff
|
tree
2015-06-02
Michael Hagg
e
rty
for-each-ref: report broken
references cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Michael Ha
g
gert
y
t6301:
n
ew tests
of
f
or-each-ref error handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Ha
m
ano
f
o
r
mat-pa
t
ch: do n
o
t
fee
d
tags to clear
_
commit_ma
r
ks()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
send-email
:
further warn about uns
u
pported sendmai
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Suns
h
i
n
e
t9001: add sendm
a
il a
l
ia
s
es lin
e
co
n
ti
n
uation
tes
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
t9001: re
f
actor sendmail al
i
ases test
infr
a
struct
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
ric Sunshine
s
en
d
-ema
i
l:
i
mplement sendmail a
l
i
ases line cont
i
nuation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshi
n
e
s
e
nd-emai
l
:
s
im
p
l
i
fy sendmail alia
s
es
c
omment and blank
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric
S
unshine
se
n
d-em
a
i
l
:
refactor sendmai
l
a
l
ia
s
es parse
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric
S
unshin
e
sen
d
-email: fix st
y
le: c
u
d
dle 'el
s
if' an
d
'else' with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
ric S
u
nshine
send
-
email: drop n
o
ise comments which merely r
e
peat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric
Sun
s
hin
e
se
n
d
-
e
m
ai
l
: visually disti
n
guish
s
e
n
dma
i
l alias
e
s
parser
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
send-e
m
ail: fu
r
ther d
o
c
u
me
n
t
missing sendmail al
i
ases
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Q
uentin Nei
l
l
blame:
add blame
.
s
h
o
w
Ema
i
l configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hama
n
o
Six
t
h batch f
o
r
2
.
5 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge branch 'sb/te
s
t-bitm
a
p-free-
a
t-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hama
n
o
Merge branch
'
mm
/
reb
a
se-i-post-rewri
t
e-ex
e
c'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Ham
a
no
Merge branch 'fm/f
e
tch-raw-sh
a
1'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
M
erge
b
ran
c
h 'sg/help-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'mm/log-format-
r
aw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C H
a
ma
n
o
M
e
rge br
a
n
c
h
'dt/
c
at-file-follow-symlin
k
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Mer
g
e
branch 'rs/
j
anitori
a
l'
commit
|
commitdiff
|
tree
2015-06-01
J
unio
C
Ha
m
ano
Mer
g
e branch
'
jk/stash-
o
ptions'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Me
r
ge branch
'
d
a/mergetool-w
i
n
m
e
rge'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o
C
Ha
m
ano
Merge
bran
c
h
'mc/com
m
it-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merg
e
branch
'
j
h/
f
i
lter-em
p
ty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Ha
m
ano
Me
r
ge
branch 'ah/usage-strin
g
s'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge branc
h
'
jk/http-backend-deadl
o
ck
'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge branch 'd
t
/clean-pathspe
c
-fil
t
er-th
e
n-lstat
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
apply: rej
e
ct a hunk t
h
a
t
does not do
a
nything
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff K
i
n
g
suppr
e
ss err
o
r
s
on missing U
N
INTERESTING
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Je
f
f King
silence broken
l
i
n
k warnings with r
e
vs->ig
n
ore_missing_links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff Kin
g
add
q
uiet
e
r
v
ersion
s
of parse_{tree
,
commit}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Thomas
B
raun
co
m
pletion: suggest sequencer com
m
ands for revert
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Stefan B
e
ller
glossa
r
y: add "rem
o
t
e
", "
s
ubmodule", "s
u
perproject"
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
s
e
tup_git_directory: delay core
.
ba
r
e/c
o
re
.
w
o
rktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff
King
Make
f
ile
:
silen
c
e
perl/PM
.
stamp recipe
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile: av
o
i
d
t
i
mestamp updates to
G
I
T
-
BUILD-OPTIONS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jef
f
Ki
n
g
Makefile: drop
depend
e
n
cy
b
et
w
een git-ins
t
aweb and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t552
0
: check reflog act
i
on in
f
a
st
-
forwar
d
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t
5
521: t
e
st
--dry-run do
e
s not
m
ake a
n
y changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul T
a
n
t5520: test
--rebas
e
failure on unborn branch
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t5520: test --
r
ebase with
multiple b
r
an
c
hes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520:
t
e
st wo
r
k tree fast-forwar
d
when fe
t
ch updates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
0:
t
est
f
or failur
e
if index has unresolved entr
i
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Stefan Beller
subm
o
du
l
e doc: r
e
o
rder i
n
troductory paragraphs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
SZ
E
D
E
R Gábo
r
Documentation: include 'merge
.
branchdesc' for merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Junio C Hamano
xmmap():
dro
p
"Out o
f
memory?"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Je
f
f Ki
n
g
config
.
c:
r
ewrite EN
O
DEV in
t
o E
I
SDIR when
m
map fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Je
f
f
Ki
n
g
config
.
c
:
avoid
x
mma
p
e
r
ror messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c:
f
ix mmap leak
w
h
en wri
t
i
n
g config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff
K
i
ng
read-cache
.
c: drop PROT_WRITE from m
m
ap of index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torroja
p4: retrieve the right r
e
vision of the file in UTF
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michae
l
H
aggerty
ref_transaction_commit()
:
d
o not capitali
z
e
e
r
ror messa
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mi
c
hael Haggerty
verify
_
lock(): do not capitali
z
e
error me
s
s
ages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
i
ch
a
el Haggerty
v
e
r
i
fy_lock(): report errors via a strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff K
i
ng
diff
.
h: rena
m
e DIFF_PLAIN co
l
or s
l
ot to DIFF_CONTEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f King
diff: a
c
cept color
.
diff
.
cont
e
xt
as a sy
n
ony
m
for "plain"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
u
n
io C Hamano
Merge bran
c
h 'nd/untracked-cache'
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff
K
ing
t70
6
3
: hide stderr from s
e
t
u
p in
s
ide prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Ju
n
i
o C Hama
n
o
t9001:
write $H
O
ME/, n
o
t
~/, to help
s
hells without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Al
l
en Hubbe
send-emai
l
:
a
d
d sendm
a
il e
m
ail aliases
format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mi
c
h
ael
H
a
g
g
erty
verify_lock(
)
:
on er
r
ors, let the caller unlo
c
k the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Hagger
t
y
verify_lock(): retu
r
n 0/
-
1 rather tha
n
struct ref_lock
*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f King
clone:
r
eorde
r
--
d
issociate and
--reference
o
pt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
eff King
clone: u
s
e
O
PT_STRING_LIST
f
or -
-
reference
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
u
nio C Hamano
diff
.
c: --ws-error-highlig
h
t=<kind> op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C Hamano
diff
.
c: add emit_del_l
i
ne()
and emit_context_
l
in
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next