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
Sync with master
2015-05-11
Junio C Hamano
S
y
nc w
i
th
m
aste
r
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
m
ano
Sync with 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'mm/usag
e
-
lo
g
-l
-
can-take-
r
ege
x
'
i
nto maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch
'
jc/diff
-
no-index-d-f
'
into m
a
i
nt-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge
branch 'o
h
/fix-config-default-us
e
r
-name
-
secti
o
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Ha
m
ano
Merge branch 'jc/epoc
h
time-wo-tz' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Se
c
ond batch fo
r
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge branch 'pt/xdg-co
n
f
i
g-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
M
e
rge branch 'ep/do-not-feed-a-
p
o
i
nter-to-array-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch
'jc/has
h
-ob
j
ect
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
m
a
no
Merge b
r
anch 'sb/pr
e
fix-
p
ath-free-results
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch '
s
g/completion-no-
r
edundant-all-comma
n
d
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
ama
n
o
Merge bran
c
h
'sg/com
p
l
ete-decorate-full-not-long'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge b
r
an
c
h 'jk/filter-branch-use-of-sed
-
on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch
'jc/daemon-no-ipv6-fo
r
-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
amano
Me
r
ge
b
ranch
'
jn/clean-use-error-not-fprintf-on-stderr'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
M
e
rge
branc
h
'tb/
b
lame-res
u
rrect-co
n
v
e
rt-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge br
a
nch
'va/fix-gi
t
-p4-t
e
st
s
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
bran
c
h
'ld
/
p4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
M
erge branch 'jk/rebase-qu
i
et-no
o
p'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C H
a
mano
Merge b
r
anch
'
v
a
/p4-client-pat
h
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merge
b
ranch 'mm/add-p-split-error'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge branch 'tb/t
0
027-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
M
e
rge branch 'ls/p4-cha
n
ges-block-
s
ize'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Me
r
ge bran
c
h 'jc/plug-fmt-m
e
r
g
e-m
s
g-lea
k
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e
branch 'nd/slim-index-
p
ack-memory-usage'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
branc
h
'jk/sti
l
l-interesting'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hama
n
o
Merge
b
ranch
'jk/reading
-
pa
c
ke
d
-
refs
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge br
a
nch 'lm/squelch-bg-p
r
ogress'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hama
n
o
M
erge bra
n
c
h
'jk
/
s
h
a1-file-r
e
duce-useless-w
a
rn
i
ngs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge bra
n
c
h
'nd/multiple-
w
ork-trees'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge
branch 'pt/creden
t
ial-xdg'
commit
|
commitdiff
|
tree
2015-05-07
Junio C H
a
ma
n
o
Merge branch 'pt/x
d
g-config-path' i
n
to next
commit
|
commitdiff
|
tree
2015-05-07
J
unio
C Hamano
Merge branch 'ep/d
o
-
n
ot-feed-a-poi
n
ter-
t
o-
a
rray-size
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
Merge
branch
'
jc/hash-object' i
n
t
o
next
commit
|
commitdiff
|
tree
2015-05-07
Jun
i
o
C Hamano
Merge bran
c
h 'sb/prefix
-
path-free-results
'
into
n
ext
commit
|
commitdiff
|
tree
2015-05-07
Juni
o
C Hamano
Merge branch
'
sg/completion-no-redundant
-
all-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Jun
i
o
C Ha
m
ano
M
e
r
ge branch 'sg/comp
l
ete-decorate-ful
l
-not-l
o
ng' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
J
unio
C Hamano
Merge branch 'nd/dwim-wildcards-a
s
-pat
h
spe
c
s'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
J
uni
o
C Hamano
Merge branc
h
'jc/me
r
ge'
in
t
o
next
commit
|
commitdiff
|
tree
2015-05-07
Juni
o
C Hamano
Merge b
r
anch '
p
h/rebase-i-r
e
do' int
o
n
ext
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
M
e
r
g
e branch
'
jk/filter-br
a
n
c
h-use-of-sed-on-inc
o
mplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branch 'tb/blame-resurrect-c
o
nv
e
rt-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
H
amano
Merge branch 'jn/clean-use-error-no
t
-f
p
rintf-o
n
-
s
tderr
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge branch 'jc
/
daemon-no-ipv6-for-2
.
4
.
1' i
n
t
o next
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio
C
Haman
o
Merge
b
ranc
h
'jc/t
e
s
t
-
prereq-validate' i
n
to
n
ext
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge
b
ranch 'bc/co
n
nect-plink' into nex
t
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C
H
amano
M
erge br
a
nch 'jk/test-chain-lint'
i
nto next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
ranch 'va/fix-
g
i
t
-p4-tests'
i
n
to
n
ext
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
mano
Merge b
r
anch 'ld/p4-case-fo
l
d
'
into n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
branch 'jk/rebase-quiet-noop' into n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C H
a
mano
Merg
e
b
ranch 'fg/d
o
cume
n
t-commit-
m
essage-
s
trip
p
ing
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'jk/stash
-
require
-
clea
n
-index' into ne
x
t
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio
C Hamano
M
e
rge branch 'jk
/
git-no-more-argv0-path-munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Me
r
ge
br
a
n
c
h 'j
c
/gitignore-precede
n
ce'
into next
commit
|
commitdiff
|
tree
2015-05-06
J
u
ni
o
C Hamano
Merge branch 'tb/
t
0
027-c
r
lf' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge branch 'va/
p
4-clien
t
-p
a
t
h' into next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Ha
m
ano
Merge branch '
m
m/add-p-
s
p
l
i
t-er
r
or
'
i
nto next
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
M
erge branch
'ls/p4-changes-block-size' in
t
o ne
x
t
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erg
e
branch 'jc
/
plug-
f
mt-merge-msg-leak' into nex
t
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branc
h
'nd/slim-index-pack-
m
emory-us
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'jk/still-inte
r
esting' i
n
to next
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Merge branch 'jk/
r
ead
i
ng-packed-refs'
i
nto next
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Merge bra
n
ch 'lm/s
q
uelch-
b
g
-
prog
r
e
ss' into next
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Ham
a
n
o
M
e
rge
b
ranch 'j
k
/sha1-f
i
le-reduce
-
useless-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'nd/mu
l
tiple-work-tr
e
es' into next
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
H
amano
Me
r
g
e
branch 'nd/dif
f
-i-t-a' i
n
to next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C Hamano
Merg
e
branch
'pt/credential-x
d
g' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Fir
s
t batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
amano
Merge
b
ranch 'jk/prune-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Merge bran
c
h 'mm/
u
sage-log-l-ca
n
-
take-regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge branch 'ep
/
fix-te
s
t-li
b
-fu
n
ctio
n
s-report'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge b
r
anc
h
'
cn/
b
o
m
-in-gitig
n
o
re'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
m
ano
Merge branch 'jc/epochtime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
branch 'nd/t1509
-
chr
o
o
t
-
test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge br
a
nch
'oh/fix-config-defa
u
lt-user-name-section'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hama
n
o
Merge branch '
j
k/type-
f
rom-
s
tring-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge branch '
s
b/test
-
b
i
t
map-free-at
-
end'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
M
e
r
g
e bra
n
ch '
l
d
/
p4
-
filetyp
e
-detecti
o
n'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
am
a
no
Merge
b
ranc
h
'
ts/checkout-ad
v
ice-plura
l
'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Ha
m
ano
Merge branch 'jk/init-core-workt
r
ee-at-r
o
ot'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
ge branch 'mh/show
-
bran
c
h-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
r
g
e
branch 'sb/line-l
o
g-plug-pai
r
diff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
n
o
Merge branch 'jc/d
i
f
f-no-index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Ham
a
no
Merg
e
br
a
n
c
h
'
b
c/ob
j
ect-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio C
Hamano
daemon: un
b
r
e
ak NO
_
I
P
V6 bui
l
d regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Ju
n
io C Hamano
w
r
ite_s
h
a1
_
fil
e
(): do not u
s
e
a
separ
a
te sha1[]
array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
J
u
nio C H
a
man
o
Git
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C
Hamano
merge: deprecat
e
'git merge <message> HE
A
D <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e: han
d
le FETCH_HE
A
D internally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C Hamano
m
e
rge: decide i
f
we auto-generate th
e
message
early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
erge: make colle
c
t_parents() auto-gene
r
ate the mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge: ex
t
ract
p
re
p
are
_
merge_m
e
ssage() l
o
gic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
m
e
rge: nar
r
ow scop
e
of merge_nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
mer
g
e: split reduce_paren
t
s
(
) out o
f
collect_p
a
rents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o C Ham
a
no
merge: clari
f
y collect_
p
arents() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: small leakfix a
n
d co
d
e
si
m
pl
i
fication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
ma
n
o
merge:
do
n
ot check
a
rgc to determine number o
f
remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next