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 'kn/cat-file-literally'
2015-05-19
Junio C Ham
a
no
Merg
e
branch 'kn
/
cat-file-literally'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
Merg
e
branch 'nd/dw
i
m
-wildca
r
ds-a
s
-pa
t
hs
p
ecs'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Merge branch 'jc/merg
e
'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hama
n
o
Merge branch '
p
h
/rebase
-
i
-r
e
do'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C H
a
m
a
n
o
Merge bran
c
h 'jc/test-pr
e
req-v
a
li
d
ate
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hama
n
o
Merge bran
c
h
'bc/c
o
nnect-plin
k
'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
M
erge branch 'jk/test-chain-lint
'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge
b
ranch 'fg/document-co
m
m
i
t-message-s
t
ripping'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Ham
a
no
Merge
b
ranch '
j
k
/
sta
s
h
-
r
e
quire
-
clean-ind
e
x'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
Merge branch 'j
k
/git-no-more
-
argv
0
-pa
t
h
-munging'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io
C Hamano
Merge branch
'
j
c/giti
g
nore-p
r
ecedenc
e
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Me
r
ge branch 'nd/d
i
ff-
i
-t-a'
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Sync w
i
th 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Git 2
.
4
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Hamano
Merge branch 'sb
/
l
i
ne-log-plug-pairdiff-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
un
i
o C Hamano
M
e
r
g
e branc
h
's
b
/test-bitmap
-
free-
a
t-end' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge
b
r
anch 'nd/t1509-
c
h
r
oot-test' int
o
maint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
i
o
C Ha
m
ano
Merge branch '
j
k/type-from-st
r
ing-gentl
y
' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge bra
n
ch 'ep/
f
ix-test-lib-functions-repo
r
t' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
m
a
no
Merge
branch 'c
n
/b
o
m-in-gitignor
e
' int
o
maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Hamano
Merge b
r
anch 'jk/prune-mtime'
into maint
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C
H
amano
Merge branch 'jk/init-core-worktr
e
e-at-root' into m
a
int
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C
Ha
m
a
n
o
Sy
n
c with 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Git 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hama
n
o
Merge
b
r
a
nch 'm
m
/u
s
age-log
-
l-can-take-regex' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge branch 'jc/di
f
f-
n
o-index
-
d-f' i
n
to main
t
-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
Hamano
M
erge branch 'oh/fi
x
-c
o
nfig-def
a
ult-
u
se
r
-name
-
section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge br
a
nch '
j
c
/epocht
i
m
e-wo-
t
z' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C
H
a
m
ano
Second
batch for 2
.
5
c
ycl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge branc
h
'pt/xdg-co
n
fig-path'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
Ham
a
no
Mer
g
e
b
ra
n
ch 'e
p
/do-
n
ot-f
e
ed-
a
-pointer-to-array-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jc/hash-
o
bject'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
ma
n
o
Merg
e
branch 'sb
/
prefix-path-free-
r
esults'
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
i
o
C Hamano
M
erge b
r
a
n
ch 'sg/comp
l
et
i
o
n-no-redu
n
d
a
n
t
-
a
ll
-
command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge branch 'sg/complet
e
-decorate-f
u
ll-
n
o
t-lo
n
g'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jk/
f
ilter-bran
c
h-use-of-sed
-
on-incom
p
l
e
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
bran
c
h 'j
c
/daem
o
n
-
no-ipv6-f
o
r-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
H
am
a
no
Merge br
a
nch
'
jn/clean-us
e
-error-not-fprintf-on
-
stderr'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'tb/b
l
ame-resurre
c
t-convert-to
-
g
i
t'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C
H
a
man
o
Merge branch 'v
a
/fix-git-p4-te
s
ts'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Haman
o
Merge branch 'ld/p4-cas
e
-fo
l
d'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C H
a
ma
n
o
Merge
b
r
a
n
ch
'jk/rebas
e
-q
u
i
et-no
o
p'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge b
r
anch 'va/p4-client-pa
t
h'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'mm/ad
d
-p
-
split-error
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
amano
M
erge branch
'tb/t0027-crlf
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
m
ano
M
e
r
g
e
bra
n
ch
'
ls/p4
-
changes
-
b
lock
-
size'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge
b
ranch
'jc/plug-fmt-merge-ms
g
-
lea
k
'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hamano
Merg
e
b
r
anch
'
nd/slim-index-pack-mem
o
ry-usage
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hama
n
o
Merge branc
h
'jk/s
t
ill-interesting'
commit
|
commitdiff
|
tree
2015-05-11
J
unio
C Hamano
M
e
rge branch
'
jk/reading-packed-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
a
n
o
Merge
bran
c
h 'lm/
s
quelch-bg-progress'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge
branch 'jk/
s
ha1-
f
ile-reduce-us
e
l
e
ss-warnings
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Ham
a
no
Merge
branch 'nd/multipl
e
-work-trees'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
ranch 'pt/credential-xdg'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
First batch
f
or 2
.
5
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Ham
a
no
Me
r
ge
b
r
a
nch 'jk/prun
e
-mtime'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
M
erge br
a
nch
'mm/usage-log-l-can-
t
ake-
r
e
g
ex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge b
r
a
nch 'e
p
/fix-test-
l
ib-
f
unctions-report'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hama
n
o
Merg
e
branch 'cn/bom-in-git
i
gnore'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
M
e
rg
e
bran
c
h
'
j
c
/
epochtime
-
w
o
-
tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge br
a
n
c
h 'nd
/
t150
9
-chroot-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'oh/fi
x
-config-d
e
fault-
u
s
er-name
-
s
e
ction'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Merge branch 'j
k
/type-from-strin
g
-
gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'sb/test-bitmap-free-at-e
n
d'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o
C Hamano
Merge branch 'l
d
/p4-filety
p
e-detection
'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
M
e
rge branch
'
ts/checkout-advi
c
e-p
l
u
ral'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge b
r
an
c
h
'
jk/init-core-
w
o
r
ktree-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Haman
o
Merge branch 'mh/show-br
a
nch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Merge b
r
anch '
s
b
/line-lo
g
-plug-pairdiff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch
'
j
c/diff-no-index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge
b
ranch 'bc/o
b
ject-id'
commit
|
commitdiff
|
tree
2015-05-05
J
u
nio
C
H
amano
daemon: unbreak
NO_
I
PV6 build regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
J
u
nio C Hamano
write_sha1_file(): do no
t
use a separate sha1[] array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
Junio C H
a
mano
G
it 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge: d
e
p
recate 'git merge <message> HE
A
D <commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Ham
a
no
merge: handle
F
ETCH_HEAD internally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
rge: decide
if we
a
uto-generate
t
he messag
e
ear
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Haman
o
merge:
m
a
ke collect_pa
r
e
nts() auto-generate t
h
e merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: extract pre
p
are_merge
_
message(
)
logic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
m
erge: na
r
r
ow
s
cope of
m
erge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: spli
t
redu
c
e_par
e
nts() out of collect_pa
r
e
nts()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C H
a
mano
merge: clari
f
y co
l
lect_
p
arents() log
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C H
a
mano
m
e
rge: sma
l
l leakfix and c
o
de simplification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
r
ge
:
d
o not c
h
e
c
k arg
c
t
o
d
etermine num
b
er of remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarify "pulling i
n
to
v
oid" special case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5
5
20: test p
u
ll
i
ng an octopus into
an
un
b
orn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
t5520:
s
tyle fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C
H
aman
o
merge: si
m
pli
f
y
co
d
e flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
m
e
rge: test the top-
l
eve
l
merge dri
v
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
H
a
mano
t
e
st:
v
alidate prer
e
q
uistes s
y
ntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge branch
'
m
h
/multimail
-
renewal'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Me
r
ge bra
n
c
h 'm
g
/
show-note
s
-
doc'
commit
|
commitdiff
|
tree
2015-04-28
Jun
i
o C Haman
o
Merge b
r
anch 'nd/version
c
mp-
p
rereleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge
branch 'mg/statu
s
-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Junio C
Hamano
Sync with
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C Ham
a
n
o
Git 2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Juni
o
C
Hamano
Merge branch 'tb/connect-ipv6-parse-fix
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-27
Junio
C
Hamano
Merge br
a
nch 'm
a
/bash
-
comp
l
e
t
ion-leaking-x'
into
m
aint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge
b
r
a
n
ch 'jc/push-
c
ert' into maint
commit
|
commitdiff
|
tree
next