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 Hamano
M
e
rge bran
c
h
'
kn/ca
t
-
file-l
i
terally'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'nd/dwim-wil
d
car
d
s-as
-
pa
t
hsp
e
c
s
'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hama
n
o
Mer
g
e branch 'jc/merge
'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
i
o
C Hamano
M
e
r
ge branch 'p
h
/rebase-
i
-redo'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
M
e
r
ge branch 'jc/test-prereq-vali
d
ate'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge b
r
anch 'bc
/
connect-plink'
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
i
o C Hamano
M
erge
b
ra
n
ch 'jk/test-chain-l
i
nt'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C H
a
mano
Merge branch
'fg/doc
u
ment-c
o
m
m
it
-
messag
e
-s
t
ripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Me
r
ge branch 'jk/stash-re
q
uire
-
c
l
ean
-
index'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C
Ham
a
no
Merge branc
h
'jk/git-n
o
-more-argv0-path-mungi
n
g'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge b
r
a
n
ch 'jc/git
i
gnore-precedence
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'nd/diff-i-t
-
a'
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Sy
n
c w
i
th 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
i
o C Hamano
Git
2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
u
ni
o
C Hamano
M
erge branch 'sb/line-log-plug-pairdiff-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C
H
amano
Merge br
a
n
c
h 'sb/test-bi
t
map-free-at-en
d
' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Ham
a
no
Merg
e
br
a
nch '
n
d
/
t1509-chroot-test' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
J
unio C
Hamano
M
e
r
g
e branch 'j
k
/ty
p
e-from-string-gent
l
y'
into
m
aint
commit
|
commitdiff
|
tree
2015-05-13
J
unio C
H
amano
Merge branch 'ep/fix
-
test-lib-functions-report' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
erge br
a
nch 'c
n
/bom-in-gitignore' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
i
o
C
Ham
a
n
o
Merg
e
branch
'jk/prune-mtime' i
n
to
main
t
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hama
n
o
Merge
branch 'jk/in
i
t-c
o
re-worktree-at-root'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
m
a
n
o
M
erge b
r
a
n
ch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Sync with
2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
M
erge branch 'mm/usage-log
-
l-can-take-regex' into main
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge bra
n
c
h
'jc/diff-no-index-d-f' into main
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merge branch 'oh/fi
x
-config-defa
u
lt-user-name
-
section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C
Ham
a
no
Merge
bra
n
c
h
'jc/epochtime-wo-tz'
i
nt
o
maint-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Seco
n
d batch for
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge br
a
nch 'pt/xdg-config-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge branch 'ep/do-not-fee
d
-a-pointer-to-a
r
ray-
s
ize'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch 'jc
/
hash
-
obj
e
ct
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
M
erge bran
c
h 'sb/prefix-path-free-results'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge branc
h
'sg
/
comple
t
ion-no-redund
a
nt-all-comma
n
d
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge branch 'sg/complete-decor
a
te-fu
l
l-not-long'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jk/fi
l
ter
-
b
r
anch-use-of-sed-on-incompl
e
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C
Hamano
Merge bra
n
ch 'j
c
/dae
m
on-no-ipv
6
-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Mer
g
e bran
c
h
'jn/clean-u
s
e-error-not-fprintf-on-st
d
err'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
M
e
rge branch 'tb
/
blame-resurrect-conve
r
t-to-git
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
am
a
no
M
erge branc
h
'va/fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Haman
o
Merge branch 'ld
/
p4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
branch 'jk/rebase-qu
i
et-noop'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Me
r
g
e
bran
c
h 'va
/
p4-client-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bra
n
ch 'mm/add-p-spli
t
-e
r
r
o
r
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge branch 'tb/t0
0
27-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Me
r
ge bra
n
ch 'l
s
/p4-changes-
b
lock-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge br
a
nch 'jc/plug-fmt-merge-msg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge
b
r
anch 'nd/slim-index-pack-memory-u
s
age'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge branch 'jk
/
still-inte
r
esting'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Ha
m
ano
Merge branch 'jk/rea
d
ing-packed-refs'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C H
a
mano
Merge br
a
nch
'lm/squelch-bg-prog
r
ess'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Ham
a
n
o
M
erge b
r
anch 'jk/sha
1
-f
i
le-r
e
duce-us
e
les
s
-warnin
g
s'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'nd/
m
ultiple-work-trees'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
M
erge br
a
nch 'pt/credential
-
xdg'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
First batch for 2
.
5
cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge
b
ra
n
ch 'j
k
/prune-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
Hamano
M
erg
e
branch 'mm
/
usage-lo
g
-l-can-take-regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Me
r
ge branch
'
ep/fix-test-lib-functions-r
e
port'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge br
a
nch 'cn/
b
o
m-
i
n-g
i
tignore'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge bra
n
ch 'jc/epochtime-
w
o-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge b
r
a
nch 'nd/t1509-chr
o
ot-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
ge branch
'
oh/fi
x
-config-default-user-name-s
e
ctio
n
'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge b
r
anch 'j
k
/type-from-strin
g
-
ge
n
tly'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
M
erge b
r
a
n
c
h 'sb/test-bitma
p
-
f
ree-
a
t-end'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'ld/p4-filetype
-
d
e
t
ection'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge bra
n
ch 'ts/checkou
t
-adv
i
ce-plural'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Haman
o
Merge branc
h
'jk/init-core-worktree-
a
t-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
ge bran
c
h 'mh/s
h
ow-
b
r
anch
-
to
p
ic
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge br
a
nch
'
sb/line-log-
p
l
ug-pairdiff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Ham
a
no
Merge bran
c
h 'jc/diff-
n
o-
i
ndex-d-f'
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
io C
H
amano
Merge b
r
anch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
J
u
nio C Ha
m
ano
daemon: unbrea
k
NO_IPV6 build regress
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Jun
i
o C Hama
n
o
write_sha
1
_fil
e
():
d
o not use a separa
t
e
s
ha
1
[] array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
J
u
n
io C H
a
mano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
m
e
rge: deprecate 'g
i
t m
e
rge <message>
HEAD <c
o
mmit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
handle
FETCH_H
E
AD internally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C
Ham
a
no
mer
g
e: d
e
cide
i
f we auto-
g
enerate
the
m
ess
a
ge
e
arly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C Hamano
m
e
r
g
e
:
make collect_par
e
nts
(
) auto-generat
e
the
merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
merge: extract prepare_merge_message() lo
g
i
c
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: nar
r
o
w scope of merg
e
_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merg
e
: split reduce_pa
r
ent
s
()
out
o
f
collect_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: clari
f
y colle
c
t_parents() log
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small leakfix and code
s
impli
f
ication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: do not check argc to determine number of remo
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
mer
g
e
:
clar
i
fy "pu
l
ling into void" speci
a
l
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C
Hamano
t552
0
: test pullin
g
an octopus into an unb
o
rn b
r
anch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
t55
2
0: sty
l
e fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: sim
p
lif
y
c
ode flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge
:
test
the top-level merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C Ha
m
an
o
t
e
st:
validate pr
e
requis
t
e
s syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
i
o C Hama
n
o
Merge
b
r
anch
'
mh/m
u
ltimail
-
r
e
newal'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio
C
H
amano
M
e
r
ge br
a
nch 'mg
/
sh
o
w-no
t
es-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge branch '
n
d/versi
o
ncmp-prer
e
le
a
ses
'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Me
r
ge b
r
a
nch
'
m
g/sta
t
us-v-v'
commit
|
commitdiff
|
tree
2015-04-27
J
u
ni
o
C Hamano
Sync w
i
th 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Me
r
ge
bran
c
h
'
t
b/connec
t
-ipv6-parse-fix' into main
t
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C Hamano
Merge branch 'ma/bash
-
c
o
mp
l
et
i
on-leaking-x' into m
a
int
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge branch 'jc/
p
ush-cert' into maint
commit
|
commitdiff
|
tree
next