repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sb/p5310-and-chain'
2015-05-19
Junio C Hamano
M
erge
branch 'b
c
/connect-plink'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hamano
M
e
rge branch 'j
k
/test-chain-lint
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'fg/docume
n
t-commit-mess
a
ge-s
t
ripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
Merge
b
ranch 'j
k
/stash-require-cle
a
n
-
index'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C H
a
m
a
n
o
Merge branch
'jk/g
i
t-no
-
m
o
r
e-arg
v
0-pat
h
-mung
i
ng'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hama
n
o
Merge branch 'jc/giti
g
nor
e
-precedenc
e
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
M
e
rge branch
'
nd/diff-i-
t
-a'
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C
H
amano
Sync with 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
Junio C Hamano
Merge branch '
s
b/lin
e
-l
o
g
-plug-pairdiff-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Ha
m
a
no
Merge
branch 'sb/tes
t
-b
i
tmap-free-at-end' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
Merge bran
c
h 'nd/t15
0
9-chroot-test' into maint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Hamano
Merge branch 'jk/type-fro
m
-st
r
ing-gentl
y
' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C
Hama
n
o
M
e
rg
e
branch 'ep/fix-
t
est-lib
-
functio
n
s-rep
o
rt' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
u
ni
o
C Hamano
Merg
e
b
r
a
nch 'cn
/
b
o
m-in-gitignore'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge bran
c
h 'jk/prune-mtime' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C Hama
n
o
Merge b
r
anch 'jk/
i
nit-core-worktree-at-root' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
l
o
g: do not shorten decor
a
ti
o
n
n
a
me
s
to
o
ear
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Ha
m
a
no
l
o
g
:
d
e
c
o
r
ate HEAD with branch
n
a
m
e
under --
d
ec
o
rate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
a
mano
Merge branch '
m
h/write-refs-sooner-2
.
3' into mh/write
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C Hamano
Merge branch 'mh/write-refs-sooner-2
.
2' into mh
/
wri
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
an
o
Sync wit
h
2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Git 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
J
unio C H
a
m
a
no
Merge bra
n
ch 'mm/usa
g
e
-l
o
g-l-c
a
n
-take-rege
x
' into
m
aint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge branch 'jc/diff-no-ind
e
x-d-f'
into maint
-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
aman
o
Merge branch 'o
h
/
fix-c
o
nfig
-
def
a
ult-user-name
-
sec
t
ion
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hamano
Mer
g
e branch
'jc/epochtime-wo
-
tz'
i
nto mai
n
t-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C H
a
mano
Secon
d
b
a
tch for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge branch
'
pt/x
d
g-config-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge bran
c
h
'ep/do-not-fee
d
-a-pointer-t
o
-array-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge branch
'jc/h
a
sh-object
'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge b
r
a
n
ch 'sb
/
prefix-path-free-results'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge br
a
nch '
s
g/completio
n
-no-redundant-a
l
l
-
c
om
m
and
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erg
e
branc
h
'sg/complete-deco
r
ate
-
ful
l
-not-lo
n
g'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge
bran
c
h 'jk/
f
ilter-
b
ranch-use-o
f
-
s
ed-o
n
-incompl
e
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
M
e
r
ge branc
h
'jc/daemon-
n
o-ipv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branc
h
'
j
n/clea
n
-use-erro
r
-
not-f
p
r
i
n
tf-on
-
st
d
err'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
M
erge branc
h
'tb
/
bl
a
m
e-resur
r
ect-convert-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C
H
amano
Me
r
ge branch 'va/fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Ham
a
no
Merge branch 'ld/p4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge bran
c
h 'jk
/
rebase-q
u
i
e
t-n
o
op'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge bran
c
h 'va/p4-client-path'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Hamano
Merg
e
br
a
nch 'mm/
a
dd-p-split-error'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
an
o
Merg
e
branch
'tb/t0027-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge br
a
nch 'ls/p4-changes-block-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
m
a
n
o
Merge b
r
a
n
c
h
'jc/
p
lug-fmt-mer
g
e
-
msg-leak
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge bra
n
ch 'nd/slim-
i
n
d
ex-pack-memory-usage'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch '
j
k/st
i
l
l
-
interesti
n
g
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
M
erge branch
'j
k
/reading-packed-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
br
a
nch 'l
m
/sq
u
elch-
b
g-progr
e
ss'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Haman
o
M
erg
e
branch 'jk/sha1-
f
ile-reduce
-
useless-wa
r
n
ing
s
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
M
e
r
ge branch 'nd
/
m
ultiple-
w
o
rk-trees'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge branch
'pt/credential-xdg'
commit
|
commitdiff
|
tree
2015-05-07
J
u
nio C Hamano
tests: skip dav http
-
pu
s
h tests under NO_E
X
PAT=NoThanks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Haman
o
F
i
rst ba
t
ch for 2
.
5
cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge bran
c
h 'jk/prun
e
-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge branch 'mm/usage-log
-
l-ca
n
-
t
ake
-
r
e
g
e
x'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'ep/fix-test-li
b
-fun
c
tions-report'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Me
r
ge bra
n
c
h '
c
n
/
bo
m
-
i
n-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
i
o
C Hamano
Merge branch
'
j
c/e
p
ochtime-wo
-
tz
'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hama
n
o
Me
r
ge b
r
a
nch 'n
d
/t1509-chroot-test'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
Hamano
Merge b
r
anch 'oh/f
i
x-config-default-user-name-section'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C H
a
mano
Merge branch
'jk/type-fr
o
m-string-
g
e
n
t
ly'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
ge branch 'sb/te
s
t-bitma
p
-free-at-en
d
'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o
C Hamano
Mer
g
e branch 'ld/p4-filetype-detection'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
ama
n
o
Merge branch
'ts/checkout-advi
c
e-plural'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
m
ano
Merge
b
r
anch 'jk
/
i
n
i
t
-core-wor
k
tree
-
at-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge branch 'mh/show-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch
'
sb/line-log-pl
u
g-pairdiff-le
a
k
'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C H
a
mano
Merge
b
ran
c
h 'jc/d
i
ff-no-index-
d
-f'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merg
e
branch
'bc/object
-
id'
commit
|
commitdiff
|
tree
2015-05-05
J
u
n
i
o C Hamano
d
a
emon:
unbreak N
O
_IP
V
6 build
regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
write_sha1_file(): do not use a separat
e
sha1[] a
r
ray
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
Junio C H
a
man
o
Git
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge: d
e
pr
e
cate 'git merge <message>
H
E
AD
<
c
o
mmit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
mer
g
e
: handle
FET
C
H_HEA
D
internal
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C Hama
n
o
merge: d
e
cide if we auto-generate t
h
e
message early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merg
e
: make collect_pa
r
e
nt
s
(
) aut
o
-generate the
me
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merg
e
:
e
xtract pr
e
p
a
re_mer
g
e_mess
a
ge(
)
l
o
gic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hama
n
o
m
e
r
g
e
:
narrow
s
cop
e
of merge_
n
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge: spl
i
t reduce_parents() out of c
o
llect_
p
arent
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
me
r
g
e:
clarify co
l
lect_parents() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Hamano
merge: small leak
f
ix
and code simplific
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge:
do not
check
a
rg
c
t
o
dete
r
mine numbe
r
of rem
o
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
merge: clari
f
y "pulling
i
nto void" sp
e
cia
l
c
ase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t
5
5
2
0: test pulling an octo
p
us into an
u
nborn branc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o C Hamano
t55
2
0: s
t
yle fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
ma
n
o
mer
g
e
:
simplify
c
ode flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Hamano
m
erg
e
: test t
h
e
to
p
-
le
v
el merge drive
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Jun
i
o C Ham
a
no
te
s
t: validate p
r
erequistes 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 branch 'mh/multimail-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Jun
i
o C Hamano
M
e
r
ge branch 'mg/show-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Ham
a
no
Me
r
ge branch
'nd/versioncmp-pr
e
releases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Ham
a
no
Me
r
g
e
b
r
anc
h
'm
g
/stat
u
s-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C Ham
a
no
Sync
w
it
h
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
J
u
n
i
o
C Ham
a
no
Git
2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o
C
H
amano
M
e
rg
e
branch 'tb/connect-i
p
v
6
-p
a
r
se-fix' into maint
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C
H
ama
n
o
Merge branch 'ma/bash-co
m
p
letion-leaking-
x
' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge
branch 'jc/push-cert
'
in
t
o maint
commit
|
commitdiff
|
tree
next