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 'rl/am-3way-config' into next
2015-06-11
J
unio C
Ham
a
no
Merge branch
'
r
l/am-3way-conf
i
g' into next
commit
|
commitdiff
|
tree
2015-06-11
Junio
C Hamano
M
e
rge bran
c
h 'jc
/
ll-merge-expose-
p
a
t
h' into next
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Mer
g
e
b
ranch 'es/
o
sx-header-pollutes-mask-macro
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io
C Hamano
M
erge branch
'
es/configur
e
-
g
etdelim' into next
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C Hamano
Merg
e
branch 'pt
/
p
u
ll-optpar
s
e'
i
nto
n
ext
commit
|
commitdiff
|
tree
2015-06-11
Junio
C Hamano
M
erg
e
branch 'qn/blame-s
h
ow-email
'
into
next
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C Hamano
Merge branch 'jc/
d
o-n
o
t-feed-tags-to-c
l
ear-commit-marks
.
.
.
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hama
n
o
Merge
b
ranch 'es/send-email
-
sendmai
l
-alias' i
n
to
n
e
x
t
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch 'jc/apply
-
reject-noop-h
u
nk' i
n
to
n
e
xt
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Ha
m
ano
Sync with master
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Sync 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 Ha
m
ano
The fi
r
st h
a
lf of
the sevent
h
ba
t
ch fo
r
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge bran
c
h 'ld
/
p4
-
editor-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'bc/objec
t
-
id'
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o
C
Hamano
Merg
e
branch 'jk/
a
t-pus
h
-
s
h
a1'
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Haman
o
M
erg
e
branch 'dl/branch-error-
m
es
s
age' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hama
n
o
Merge branch 'jk/skip-htt
p
-test
s
-under-no-c
u
rl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge
b
ranch 'ps/doc
-
p
ackfile-vs-pack-file'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
M
e
rg
e
branch '
f
g
/
do
c
u
m
e
nt-commit-message-st
r
ipping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merg
e
bran
c
h 'jk/rerere-forget
-
check-e
n
a
bl
e
d' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
amano
Merge branch 'pt/p
u
ll-log-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'pt/pull-f
f
-
vs-m
e
rge-ff' into
ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch
'rs/plug-le
a
k-in-pa
c
k-bitmaps' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Mer
g
e branch 'ja/t
u
t
o
r
i
al-asci
i
d
octor-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch '
j
k/st
r
ipsp
a
ce-asciidocto
r
-
f
ix' into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bra
n
ch 'jk/asc
i
idoc-markup-
f
ix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
Hamano
Merge branch 'ps/bundle-verify-a
r
g
' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch 'mh/
w
r
i
te-refs-sooner-2
.
4'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Mer
g
e branch
'
mh/ref-dir
e
ctory-file
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge
b
ranch 'mg
/
log-decorate-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C H
a
mano
Mer
g
e branch 'sb/t
1
020-cleanup' int
o
m
a
in
t
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branch 'jc/gitignore-precedence' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
a
m
ano
M
er
g
e branch 'bc/connect-plink' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
branch 'ph/reb
a
se-i-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'jk/add-e
-
k
i
l
l
-
e
ditor' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bra
n
ch
'
mh/clone-ve
r
bosity-f
i
x' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hama
n
o
Merge
b
ranch 'jk/sha1-file-red
u
ce-useles
s
-warn
i
ngs
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merg
e
branch
'tb/blame-resurrec
t
-convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch '
j
c/plug-fmt-merge-m
s
g-
l
e
a
k' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e branch 'pt/
x
dg-config-p
a
th' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-04
Jun
i
o C Hamano
ll-m
e
r
g
e: pass the original path t
o
external dri
v
e
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Junio C Hamano
Merge
bra
n
c
h '
n
d/slim-in
d
ex-pa
c
k-
m
emory-usage' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
Ju
n
io C H
a
mano
Merg
e
b
ran
c
h 'sb/pack-protoco
l
-mention-
s
m
art-http'
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
J
unio C Ha
m
ano
Merge branch 'j
k
/
make-fix-depend
e
ncies' into next
commit
|
commitdiff
|
tree
2015-06-04
J
unio C Hamano
Merge bra
n
ch 'jk/die-on-bogus-worktree-lat
e
'
into next
commit
|
commitdiff
|
tree
2015-06-04
Junio C Hama
n
o
M
e
rge branch 'sg/m
e
rge-summ
a
ry
-
config
'
into next
commit
|
commitdiff
|
tree
2015-06-04
Junio C Hamano
Merge br
a
nch
'
ah/send-emai
l
-
sendmail-alias' into next
commit
|
commitdiff
|
tree
2015-06-04
Re
m
i
Le
s
pinet
g
i
t
-
am: add am
.
three
W
ay
c
onfig variab
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Remi Lespinet
t
41
5
0-am: refactor am -3 tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Re
m
i L
e
spinet
git-am
.
sh:
fix
in
i
ti
a
lization of the threeway va
r
iable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Jeff
K
in
g
i
n
d
ex-
p
ack: fix t
r
uncation of off_t i
n
comp
a
r
i
son
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
Eric Suns
h
ine
c
on
f
igure: add getdelim() check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
Eric Sunshine
con
f
i
g
.
mak
.
uname: Darwin:
define HAVE_GETDELI
M
fo
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
J
e
ff King
ewah
:
u
s
e
less gen
e
ric
m
acro name
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
E
r
i
c
S
unshi
n
e
ewa
h
/bitmap: sile
n
ce warning about
MASK
m
a
c
ro redefiniti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
St
e
fan Beller
Documenta
t
i
o
n/t
e
chnical/pack-protocol: mention http
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul
T
an
pull: use git
-
rev-parse --parse
o
pt fo
r
option pars
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
p
ul
l
: han
d
le git-fetch's options a
s
well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Jun
i
o
C
H
amano
Merge
b
ra
n
ch
'pt/pull-tests
'
into pt/pull-op
t
p
arse
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
for
m
at-patc
h
: d
o
not feed
t
a
gs to clear_commit_
m
arks(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric
S
unshine
s
end-email: further wa
r
n about unsupported sendm
a
i
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
t9001: add sendm
a
il alia
s
es line
continuation tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Er
i
c Sunshine
t
9
001: refactor sendmai
l
alias
e
s
t
est infras
t
ructure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sun
s
hine
send-
e
mail
:
implement sendmai
l
aliases
line continuation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric S
u
nshine
send-ema
i
l: simplif
y
sendmail aliases
c
omm
e
nt and bla
n
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
E
r
ic Sunshine
send-
e
mail: re
f
acto
r
sendm
a
i
l
aliases parser
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
E
r
ic Sunshine
send
-
ema
i
l: f
i
x style: c
u
ddle 'elsif' and 'else
'
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric Suns
h
i
n
e
s
end-email
:
drop noise
comments which merely repea
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Er
i
c
S
unshine
send-email:
visuall
y
disti
n
guish send
m
ail aliases
parse
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric
S
un
s
hine
send-email: further
d
o
cument missing sendmail aliase
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Quentin N
e
ill
blam
e
: add blam
e
.
showEmail c
o
nfigur
a
tio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Sy
n
c wi
t
h master
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Ha
m
ano
Merge branch 'tb/c
o
mple
t
e-sequencing' into next
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C
Hamano
Me
r
ge branch 'jk/s
q
uel
c
h
-missing-link
-
warnin
g
-
f
or-unreachabl
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'pt/pull
-
t
ests'
i
nto n
e
xt
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hama
n
o
Merg
e
br
a
nch 'sb/glossa
r
y-sub
m
odule' into next
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge b
r
anch 'sb/s
u
bmodule-doc-intr
o
' into next
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
ma
n
o
Merge branch 'jk/diagnose-config-mmap-f
a
i
lure' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
Merge branch
'mt/p4-depot
F
ile-a
t
-ve
r
sion' into next
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
a
m
a
no
Merge bran
c
h 'mh
/
verify-lock-error-
r
eport' in
t
o n
e
xt
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o
C Hama
n
o
M
e
rge b
r
anch 'jk
/
c
o
lor-diff
-
pla
i
n-
i
s-c
o
n
text' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C
H
a
m
an
o
M
e
rge branch 'jk/clone-dis
s
o
c
i
a
t
e
' into next
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
M
e
rge branch '
j
c/dif
f
-ws-err
o
r
-highlight' into next
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
a
mano
Si
x
t
h
batch for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Merge bra
n
c
h
'sb/test-bitmap-free-at-end
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branc
h
'mm
/
rebase-i-post-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
r
g
e
branc
h
'fm/fetch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o
C
H
a
ma
n
o
Merge branch 'sg/help-g
r
oup'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e
branch '
m
m/log-
f
orm
a
t-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merg
e
bra
n
ch 'dt/cat
-
file-follow-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Haman
o
M
e
rge branch
'
rs/jani
t
orial'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Mer
g
e
b
ranch 'jk/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Ha
m
ano
M
erge branc
h
'da/mergetool-wi
n
m
e
rg
e
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
g
e b
r
anch 'mc/com
m
it
-
doc-gra
m
mofix'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Merge
b
r
a
nc
h
'jh/fi
l
ter-empty-cont
e
n
t
s'
commit
|
commitdiff
|
tree
2015-06-01
J
unio
C Hama
n
o
Merge
b
ranch 'ah/usage-strin
g
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
n
o
Merge branch 'jk/ht
t
p-backend-
d
e
ad
l
ock'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
b
r
a
nch 'dt/clean-pathspec-fil
t
er-th
e
n-lstat'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
appl
y
:
rej
e
ct a hunk that
does not do
anything
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next