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 'fm/fetch-raw-sha1' into next
2015-05-11
Junio
C H
a
man
o
Sy
n
c wit
h
mas
t
er
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merg
e
br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2015-05-11
J
un
i
o C Hamano
Syn
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
Ju
n
io
C
Hamano
M
e
rge
b
ranch 'm
m
/us
a
ge-log-l-can-take-r
e
gex' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
ranch 'j
c
/
di
f
f-
n
o-ind
e
x-d-
f
' i
n
to maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
M
e
rge
branch 'oh/fi
x
-
config-defau
l
t-user-
n
ame-
s
e
c
ti
o
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
branch 'jc/
e
p
o
ch
t
ime
-
w
o-tz'
into maint
-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ham
a
no
S
econd batch for 2
.
5
c
ycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
Ham
a
no
Merge
bra
n
ch 'pt/xdg-config-p
a
th'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'ep/do-
n
ot
-
f
ee
d
-
a-pointer-to-array-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Me
r
ge
b
ranch 'jc/has
h
-object'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C Ha
m
ano
Merge branch 'sb/p
r
efix-path-f
r
ee-resul
t
s
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ha
m
a
no
Merge
branch 'sg/c
o
mpletion-n
o
-redundant-al
l
-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bran
c
h 'sg/co
m
plete-d
e
corate-full-n
o
t-l
o
ng'
commit
|
commitdiff
|
tree
2015-05-11
J
unio
C Haman
o
Merg
e
branch 'j
k
/filter-br
a
n
c
h-u
s
e-of-sed
-
on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge branch '
j
c/daemon-no-i
p
v6-for
-
2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
a
no
Merge bra
n
ch 'jn/c
l
ean-us
e
-error-not-fprintf-on-stde
r
r'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merge branch '
t
b
/blame-r
e
surrect-
c
onve
r
t-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge branch '
v
a/fix-git-p4-test
s
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
r
g
e branch '
l
d
/
p4-case-fo
l
d'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bra
n
ch 'jk/reba
s
e-quiet-noop'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Ham
a
n
o
Merge branch 'va/
p
4-client-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
ma
n
o
Merg
e
branch '
m
m/ad
d
-p-
s
plit-error'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch 'tb/t0027-crlf'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C Hama
n
o
Mer
g
e branch
'
l
s/p4-changes-block-size
'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C
H
a
mano
Merge
b
r
anch 'j
c
/plug-fmt-merg
e
-msg-lea
k
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
M
e
r
g
e branch 'nd/slim-index-pack-memor
y
-usag
e
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
bran
c
h 'jk/still-in
t
erestin
g
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge branc
h
'jk/reading-
p
acked-ref
s
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Mer
g
e
bran
c
h 'lm/squelch-bg-p
r
og
r
ess'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Ha
m
ano
Merge branch 'jk/sha
1
-
file-reduce
-
useless-warnings'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Ha
m
ano
Merg
e
branc
h
'nd/mult
i
pl
e
-work-trees'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
M
erge
b
ra
n
ch 'pt/creden
t
ial-xdg'
commit
|
commitdiff
|
tree
2015-05-07
Junio
C Hamano
Merge
branch 'pt/xdg-config-path' into next
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
Merg
e
branch 'ep/do-n
o
t-feed-a-pointer-to-array-size
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C Haman
o
Merge branc
h
'jc/hash-
o
bject' into n
e
x
t
commit
|
commitdiff
|
tree
2015-05-07
Junio
C
Hamano
Me
r
ge
b
ranch
'
sb/
p
r
e
f
ix-pa
t
h
-
free-results
'
into next
commit
|
commitdiff
|
tree
2015-05-07
Jun
i
o C H
a
mano
Merge branch 'sg/completion-n
o
-redundant-all-com
m
and
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
J
uni
o
C Hamano
Merge branch 'sg/complete-decorate
-
full-not-lo
n
g'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C
H
amano
Merge branch 'nd/dwim-wildc
a
rds
-
a
s-pa
t
h
s
pecs'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
Merge branc
h
'jc/merge' i
n
to next
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
M
e
rge bran
c
h 'ph
/
r
e
b
a
se-
i
-r
e
do' into n
e
xt
commit
|
commitdiff
|
tree
2015-05-07
Junio
C
Hamano
M
e
rge b
r
anch '
j
k
/
f
ilter-branch-use-of-
s
ed-on-inco
m
plete
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
J
unio C Hama
n
o
tests:
skip dav
http-push tests
under NO_EXPAT=N
o
Thanks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
M
erg
e
branc
h
'tb/blame-re
s
urrect-convert-to-g
i
t' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge
b
ranch '
j
n/
c
lean-use-error-not-fprint
f
-o
n
-stderr
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
m
ano
Me
r
ge branch 'jc/daemon-no-ipv6-fo
r
-
2
.
4
.
1' into next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C
Hamano
Mer
g
e bran
c
h 'j
c
/test-prereq
-
validate' int
o
next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'bc/con
n
ect-plink' int
o
next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge b
r
anch 'jk/test-cha
i
n
-
lint' into next
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge
b
ranch
'va/fix-git-p
4
-tests' into n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o C Hamano
Me
r
g
e branch 'ld/p
4
-case-fold' into n
e
x
t
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
m
an
o
Merge bra
n
ch
'
j
k
/rebase-
q
u
i
et-no
o
p' into ne
x
t
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Mer
g
e
branch 'f
g
/docume
n
t
-
commit-message
-
stripping
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branch 'j
k
/
s
t
as
h
-requi
r
e
-
clean-ind
e
x' into next
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge bran
c
h 'jk/git-no
-
mor
e
-
arg
v
0
-
pat
h
-munging'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
M
e
r
g
e
b
r
a
n
ch 'jc/gitignore-pr
e
c
e
d
e
nce
'
into next
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Me
r
ge branch 'tb/t0027-crlf' into n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Merge branch
'
va/
p
4
-
clie
n
t-path' into next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
H
a
m
a
n
o
Merge bra
n
c
h
'mm/add-
p
-split-error' into next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C Hamano
M
e
rge bra
n
ch 'ls/p4-chan
g
es
-
block-size' into next
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o
C Hamano
M
erge
b
ra
n
c
h
'jc/p
l
ug-fmt
-
merge-m
s
g-leak' into next
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
H
a
m
a
n
o
M
e
rge bra
n
ch 'nd/
s
lim
-
index-pack-
m
emory-usage' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
g
e
bran
c
h
'jk/still-interesting' into next
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Ha
m
ano
M
er
g
e
b
r
a
nch
'
jk/reading-packe
d
-re
f
s'
into
n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Merge branch 'lm/squelch-bg
-
progress' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
mano
Merge branch
'
j
k/sha
1
-file-redu
c
e-useless-wa
r
n
i
ngs
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'nd/multi
p
le-work-trees'
in
t
o next
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge branch 'nd/di
f
f-
i
-t-a' i
n
to next
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
mano
Merge bran
c
h 'pt/cred
e
ntial-xdg' into next
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
io
C
H
a
m
ano
F
i
rst batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge branch 'j
k
/prun
e
-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
M
e
rge bra
n
ch 'mm/usag
e
-log-l-
c
an-take-regex'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge branch 'ep
/
fix-test-lib-fu
n
c
t
ions-report'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
M
e
r
g
e branch 'cn/bom-in-gitign
o
r
e
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branch 'jc/epochtime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
Ham
a
no
M
erge bra
n
ch 'nd/t1509-c
h
root-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Me
r
ge branch
'
oh/fix-c
o
nfi
g
-defau
l
t-user-name-secti
o
n'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge b
r
a
n
ch '
j
k/type-f
r
om-
s
tri
n
g
-
gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
g
e
b
ranch 'sb/test-bitmap-free-at-e
n
d
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge branch 'ld/p4-filetype-d
e
tection'
commit
|
commitdiff
|
tree
2015-05-06
J
u
ni
o
C H
a
mano
Merge b
r
anch 'ts/check
o
ut-advice-plural'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Me
r
ge br
a
nch 'jk/init-core-worktree-at-
r
oot'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e bran
c
h
'mh/show-branch
-
topi
c
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge branch
'sb/l
i
n
e
-log-
p
lug-pairdiff-l
e
ak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Me
r
ge branch 'jc/diff-no-ind
e
x
-
d-
f
'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Ha
m
ano
Merge branch 'bc/objec
t
-id
'
commit
|
commitdiff
|
tree
2015-05-05
Jun
i
o C
H
amano
daemon: unbreak NO
_
IPV6 build regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
wr
i
t
e
_sha1_
f
ile(): do not
u
s
e
a
s
e
parate sha1
[
] array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Hamano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
m
e
rge: deprecate
'
git
m
erge <message>
H
E
A
D <c
o
m
mit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
H
amano
merge:
h
andle FETCH_HEAD int
e
r
n
ally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o C
H
amano
merge
:
d
ecide if we
auto-gene
r
at
e
th
e
message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
mer
g
e: make
collect_par
e
nts()
a
uto-gener
a
te
t
h
e m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: extract prepare_merge_
m
es
s
ag
e
() lo
g
ic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ha
m
ano
m
e
rge:
n
arrow scope of
merge
_
n
a
m
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge: sp
l
it r
e
duce_parents() out of c
o
llect_
p
a
r
ents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merge: cla
r
ify collect_par
e
nts()
l
ogic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
am
a
no
merge
:
small
leakfix a
n
d cod
e
s
implific
a
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next