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
J
u
nio C H
a
man
o
Merge b
r
a
nch 'kn/cat-fi
l
e-literally'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge br
a
nc
h
'nd/dwim-wildcards-
a
s-pathspe
c
s'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Ha
m
ano
Merge branch 'jc
/
merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge
branch 'ph/rebas
e
-i-r
e
do'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branc
h
'jc/test-
p
rereq-validate'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge branch
'
bc/connect-plink
'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Hama
n
o
Merge branch 'jk/test
-
chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Haman
o
Mer
g
e branch 'fg
/
d
oc
u
m
e
n
t
-com
m
i
t
-message-stripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
r
ge
b
r
a
nc
h
'jk/stash-requ
i
re-clea
n
-ind
e
x'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Mer
g
e bran
c
h 'jk/git-no-more-ar
g
v0-path-mungi
n
g
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
Me
r
ge branch
'jc/gi
t
ign
o
r
e
-
p
reced
e
n
c
e'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
Merge br
a
nch 'nd/dif
f
-i-t-a'
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Ham
a
no
Sync with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Hamano
Gi
t
2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C H
a
mano
M
erg
e
branch 'sb/line-log-plu
g
-pai
r
diff
-
l
e
a
k
' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Haman
o
Mer
g
e br
a
nch
'
s
b/t
e
st-bitmap-free
-
at-end' into m
a
int
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
erge
b
ranch '
n
d/t1509-
c
hroot-te
s
t' int
o
maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge
branch '
j
k/type-fr
o
m-string-gently' in
t
o maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Hamano
M
e
rge
branch
'
e
p/fix-test-lib-f
u
nctions-report'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'c
n
/bom-in-gitignore' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Ha
m
ano
Merge br
a
nch
'j
k
/prune-mti
m
e' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
Merge
branc
h
'
j
k/init-core
-
worktree-at-roo
t
'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o C Hamano
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Sync
w
ith 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
Me
r
g
e branch
'mm/usage
-
l
og
-
l-can-take-regex' in
t
o
maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
H
aman
o
Merge
b
ranc
h
'jc
/
di
f
f-no-index-d-f'
i
n
to maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge branch
'
oh/fix-conf
i
g-default-user-name-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
M
e
r
ge
branch 'jc/ep
o
c
htime-wo-tz' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
S
econd bat
c
h for
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge
branch
'
pt/
x
dg-
c
on
f
ig-path'
commit
|
commitdiff
|
tree
2015-05-11
J
un
i
o C Haman
o
Merge
b
ranch 'ep/
d
o-not-
f
e
ed-a-po
i
nter-t
o
-ar
r
ay
-
si
z
e'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Mer
g
e bran
c
h 'j
c
/
ha
s
h
-object'
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
io C Hamano
Merge branch 'sb/prefix-pa
t
h-free-
r
e
sults'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
bra
n
c
h
'
sg/com
p
letion-no-re
d
unda
n
t-
a
ll-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io
C
Ham
a
n
o
Merge bra
n
ch 'sg
/
complete-de
c
o
r
ate-full-no
t
-lon
g
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
m
a
no
Merge branch '
j
k/filter-branch-use-o
f
-
s
ed-on-incompl
e
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Haman
o
Me
r
ge bra
n
ch 'jc/daemon-no-
i
pv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
M
erge branch 'jn/clean-use-
e
rror-not-fprintf-on-
s
t
derr'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C
Hamano
Merge branch 'tb/blame-re
s
urrect-
c
o
n
vert
-
to-git'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge
br
a
nch 'va/fix-
g
it-p4
-
tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'ld/p4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o C Ham
a
no
M
e
r
g
e branch 'jk/re
b
a
s
e-quiet-noop'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merge bran
c
h
'
va/p
4
-c
l
ie
n
t-pa
t
h'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hamano
Merge b
r
anch 'mm/
a
dd-p-split-
e
rror'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
M
erge
b
r
a
nch 't
b
/t0027-c
r
lf'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io
C
Hamano
M
e
r
ge branch
'l
s
/p4-cha
n
g
e
s-bl
o
ck-si
z
e'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
ama
n
o
Merg
e
b
r
an
c
h 'jc/pl
u
g-fmt-merge-msg
-
l
e
a
k'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
ranc
h
'nd/sli
m
-index-pa
c
k-memo
r
y-usage'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge b
r
anch 'jk/still-in
t
eresting'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge branc
h
'jk/reading-packed-re
f
s'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Ham
a
n
o
Merge branch '
l
m/squelch-bg-progress'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge branch 'jk/sha1-f
i
le-reduc
e
-useless-warn
i
n
gs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge br
a
nch 'nd
/
m
u
l
tipl
e
-
w
ork-trees'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
branch '
p
t/cre
d
e
ntial-xdg'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Fi
r
st batch
f
o
r
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
ge branc
h
'jk/prune-mt
i
me'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge branch
'
mm/usage-log-l-c
a
n-
t
ake-regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branc
h
'ep
/
fix-test-l
i
b
-
f
unctions-report
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge b
r
a
n
ch 'cn/bom-i
n
-gitignore
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
ranc
h
'jc/epo
c
htime
-
wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
J
unio
C
Ha
m
an
o
Merge b
r
anch 'nd/t1509-chroo
t
-te
s
t
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Haman
o
Merge bran
c
h 'oh/fix-config-default-user-name-section'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C Ha
m
ano
M
e
rge branch
'jk/t
y
pe-from-st
r
ing
-
gen
t
l
y'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge b
r
a
nch
'sb/t
e
st-bitm
a
p-free-at-end'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hama
n
o
Merge branch 'ld/p4-filetype-det
e
c
t
i
o
n
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
ge branch 'ts/checkout-advice-pl
u
ra
l
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Merge branch 'jk/init-core
-
workt
r
ee-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Merg
e
bra
n
ch 'm
h
/
show-bra
n
c
h
-topic
'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Merge branch 'sb/line-log-plug-pairdif
f
-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
ma
n
o
M
e
r
ge bran
c
h
'jc/
d
if
f
-no-index-d-f
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
a
no
Merge branch 'bc/
o
b
ject-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hama
n
o
daemon:
unbreak NO_IPV6 build regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C
H
amano
write_sha1_file(): do not use a
separate
sh
a
1[] array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Hama
n
o
Gi
t
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merg
e
: d
e
precate 'git
merge <message> HEAD <
c
o
m
mit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: handl
e
FETC
H
_HE
A
D in
t
ernal
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
a
n
o
merge: deci
d
e if we auto-generat
e
th
e
m
e
ssage early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hama
n
o
merge:
m
ake colle
c
t_parents(
)
aut
o
-generate the m
e
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C
Ha
m
ano
merg
e
: e
x
tract prepare_merge_message() logi
c
ou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: na
r
row
scope o
f
merge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: s
p
l
i
t reduce
_
p
a
r
en
t
s() ou
t
of
c
ollect_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge: clarify co
l
lect_paren
t
s() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small
lea
k
fi
x
and cod
e
s
implif
i
catio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: do not check argc
t
o determine n
u
mber of
r
emote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
H
a
m
an
o
merge: cla
r
i
f
y "pulli
n
g into void"
speci
a
l
c
a
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
t552
0
: test pulling an
octopus into an unb
o
rn branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520: style
f
i
x
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
merge: si
m
pl
i
fy
c
o
d
e
flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
merge: test
the
t
op-
l
evel merge driv
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
unio
C
Ham
a
no
te
s
t: validat
e
prerequistes syn
t
a
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C H
a
m
ano
Merge
bra
n
c
h
'mh/multima
i
l-ren
e
wal'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge
b
ranch 'mg/show
-
n
otes-doc
'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio
C
Hamano
Merge branch 'nd/vers
i
oncmp-prerelea
s
e
s
'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Ha
m
ano
Me
r
g
e bran
c
h
'mg
/
st
a
tus-v-
v
'
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Sync wit
h
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Hamano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
M
e
rge branch '
t
b
/connect-ipv6-par
s
e-fi
x
'
into maint
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C H
a
m
ano
Merge branch 'ma/bash-completion-l
e
aking-x' into maint
commit
|
commitdiff
|
tree
2015-04-27
Juni
o
C Ham
a
no
M
e
rge branch 'jc/push-cert' into
m
ai
n
t
commit
|
commitdiff
|
tree
next