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
Juni
o
C Hamano
Syn
c
w
i
t
h ma
s
ter
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hama
n
o
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
m
a
no
Syn
c
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 Haman
o
Merge branch 'mm/usage-
l
og-l
-
can-t
a
ke-regex' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
unio C H
a
ma
n
o
Me
r
g
e
b
ranch 'jc/
d
i
f
f-no-in
d
ex-d-f' into
m
aint-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rg
e
b
r
anch 'oh/fi
x
-config-default-user-na
m
e-secti
o
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hamano
Merge branch 'jc
/
e
p
ochtime-wo-tz' in
t
o maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Se
c
o
n
d batc
h
for 2
.
5 cy
c
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C
H
a
mano
M
erge b
r
a
n
c
h 'pt/x
d
g-
c
onfig-p
a
th'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'e
p
/do-not
-
feed-a-poi
n
ter-to-array-size'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Mer
g
e branch 'jc
/
hash-o
b
je
c
t'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Ha
m
an
o
M
erge
b
r
anch 'sb/p
r
efix-path-free-results'
commit
|
commitdiff
|
tree
2015-05-11
J
unio
C H
a
mano
M
erge bran
c
h
'sg/co
m
pletion-no-redundant-al
l
-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
M
erge bran
c
h '
s
g/
c
o
mplete-decorate-full-not-long'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jk/fi
l
t
e
r-branc
h
-us
e
-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge branch
'
jc/daemon-no-ip
v
6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
bran
c
h 'jn/clea
n
-
use-error-not-
f
printf-on-stderr'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merg
e
b
ranch
'
tb/b
l
ame-resur
r
ec
t
-convert-to-gi
t
'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C
Ha
m
ano
M
er
g
e branch 'va/fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
M
erge
branch 'ld/p4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
J
uni
o
C Hamano
Merge
b
r
anch '
j
k/rebase-quiet-
n
oop'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch 'va/
p
4
-
client-
p
ath
'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C Hamano
Merge b
r
a
nch 'mm/add-p-split-error'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'tb/
t
0027-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'ls/p4-
c
hange
s
-
block-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hama
n
o
M
erge branch '
j
c/plug-
f
mt-merge-
m
sg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
am
a
no
M
er
g
e branch 'nd/slim-
i
ndex-pack-memo
r
y-usa
g
e'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Mer
g
e
b
ran
c
h 'jk/st
i
ll-
i
nteresting'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hamano
M
e
rge b
r
anch
'
jk/reading-pa
c
ked-refs
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge branch '
l
m/squelch-bg-progress
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jk/sha1
-
file-reduce-useless-war
n
ings'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch
'
nd/m
u
ltiple-work-trees
'
commit
|
commitdiff
|
tree
2015-05-11
J
uni
o
C H
a
m
ano
Merge bra
n
ch
'
pt/credential-
x
d
g
'
commit
|
commitdiff
|
tree
2015-05-07
Jun
i
o
C
Hamano
Merg
e
bran
c
h 'pt/xdg-
c
onfig-path'
into nex
t
commit
|
commitdiff
|
tree
2015-05-07
Jun
i
o C Hama
n
o
Merge b
r
anch 'ep/do-
n
ot-feed-a-
p
ointer-to-arra
y
-s
i
ze
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hama
n
o
Me
r
ge bra
n
ch 'jc/ha
s
h-object
'
i
nto next
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
Merge branch '
s
b/pr
e
f
i
x-path-free-results' into next
commit
|
commitdiff
|
tree
2015-05-07
Junio C
Hamano
Merge branch
'
sg/completio
n
-n
o
-redund
a
nt-all-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
Merge branc
h
's
g
/com
p
lete
-
decora
t
e
-
f
u
ll-
n
o
t
-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C Ham
a
no
Merge branch '
n
d/dwim-wildcards-as-pathsp
e
cs' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C
Hamano
Merge branch
'
jc/merge' into next
commit
|
commitdiff
|
tree
2015-05-07
J
u
n
io C Hamano
Merge branch 'ph/re
b
ase
-
i-redo' into next
commit
|
commitdiff
|
tree
2015-05-07
Junio C Ha
m
an
o
Merge br
a
nch 'jk/fi
l
te
r
-bra
n
ch-use-of-sed-on-inco
m
plete
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Ha
m
ano
Merge b
r
anc
h
'tb/blame
-
res
u
r
r
ect
-
con
v
e
rt-to-gi
t
' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge br
a
nch 'jn/cl
e
an-use-error-not-fprintf-o
n
-stderr
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Mer
g
e bra
n
ch 'jc/da
e
mo
n
-
no-i
p
v6-for
-
2
.
4
.
1' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
M
erge branch 'jc/test-prer
e
q-validate'
i
nto next
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
Hamano
Merge branc
h
'bc/con
n
ect-plink' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e branc
h
'jk
/
te
s
t-ch
a
in-l
i
nt' into
n
ext
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e
branch 'va/fix-git
-
p4-tests' into next
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge branc
h
'ld/p4-case-fold
'
into
next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
branch 'j
k
/rebase-quiet-n
o
op' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e branch 'fg/document-commit-
m
essage-s
t
rip
p
in
g
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Ha
m
ano
Merge branc
h
'jk
/
sta
s
h
-
r
equire-clean
-
in
d
ex' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge branch 'jk/g
i
t-no-mor
e
-argv0-path-mung
i
ng
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
M
erge branch 'j
c
/gi
t
ign
o
re-precedence
'
into
n
ext
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Mer
g
e branch 'tb/t00
2
7-crlf' into
next
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
M
e
rge branch 'va/p
4
-
client-path' i
n
to next
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
M
e
rge branch 'mm/
a
d
d
-
p-split-error' in
t
o next
commit
|
commitdiff
|
tree
2015-05-06
J
u
ni
o
C Hamano
Merge bran
c
h 'ls/p4
-
cha
n
g
es-block-siz
e
' into next
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
H
a
m
a
no
Merge branch 'jc/plu
g
-fmt-merge-msg-leak' into nex
t
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
M
e
rge bran
c
h 'n
d
/sl
i
m-i
n
dex-
p
ack-mem
o
ry-usage'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge branch 'jk/st
i
ll-interes
t
ing' into ne
x
t
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
M
e
r
ge
b
ranch 'jk/rea
d
ing
-
packed
-
r
efs' into n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
Junio
C H
a
mano
M
e
rg
e
branch 'lm/squelch-bg-progress
'
into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch
'jk/
s
ha1-fi
l
e-re
d
uc
e
-usele
s
s-warn
i
ngs
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e
branch 'nd/multip
l
e-work-trees'
i
nto
n
e
x
t
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge branc
h
'nd/
d
iff-i
-
t-a' in
t
o next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch
'pt/cred
e
nti
a
l-xdg'
i
nto next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
F
ir
s
t batch for
2
.
5 c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
M
e
rge
b
ranch 'jk/p
r
une-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
an
o
Merge b
r
anch 'mm/usage-l
o
g-l-can-take-re
g
ex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
ama
n
o
M
erge branch 'ep
/
fix-t
e
st-lib-f
u
nctions-re
p
ort'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
a
mano
Merge branch 'cn/bom-in-giti
g
nore'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Merge
bran
c
h 'jc/
e
p
ochtim
e
-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge
b
ranch 'nd/t1509-ch
r
oot-te
s
t'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge
branch '
o
h
/
fix-config
-
default-user
-
n
a
me-section'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge branch 'jk
/
type-from-string-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch
'
sb
/
test-bitmap-free-at
-
end'
commit
|
commitdiff
|
tree
2015-05-06
J
u
ni
o
C Hamano
M
e
rge branch 'ld/p4-filetype
-
detect
i
on'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge branch 'ts/checkout-a
d
vice-pl
u
ral'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C
Hamano
Merge
bran
c
h 'jk/in
i
t-core-w
o
rkt
r
e
e
-
a
t-ro
o
t'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge b
r
anch
'
m
h/show-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
J
u
ni
o
C Hamano
Merge
branch 'sb/line-log-plug-pairdiff
-
lea
k
'
commit
|
commitdiff
|
tree
2015-05-06
J
un
i
o C Hamano
M
e
rge branc
h
'jc/di
f
f-no-index-d-
f
'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Haman
o
Merg
e
b
r
anch 'b
c
/object-id'
commit
|
commitdiff
|
tree
2015-05-05
J
u
nio C H
a
m
a
n
o
daemon: unbreak N
O
_
I
PV6 bui
l
d regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
Junio C H
a
ma
n
o
write_sha
1
_f
i
le(): do not use a separat
e
s
ha1[] ar
r
ay
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
Junio C
H
amano
Git 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge:
d
epreca
t
e
'
g
it merge <mess
a
ge> HE
A
D <commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merge: ha
n
d
le FETCH
_
HEAD internally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
d
ecide i
f
we auto-generate the
message
e
a
r
ly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge: mak
e
co
l
lect_
p
arents() aut
o
-genera
t
e t
h
e merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: extrac
t
prepare_me
r
ge_message() logic o
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Haman
o
merg
e
:
nar
r
ow scope of me
r
g
e_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: sp
l
it red
u
ce_parents() o
u
t of c
o
llect_p
a
rents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
merge: clarif
y
collect_parents()
logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merg
e
: small leakfi
x
and code sim
p
lif
i
ca
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C
Hamano
merge:
do
not ch
e
ck argc to d
e
termine num
b
er of remo
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next