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 'ps/bundle-verify-arg'
2015-05-22
Juni
o
C
H
amano
Merge bran
c
h
'ps/bundle-verify-a
r
g'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C Hama
n
o
Merge branch 'ls
/
http
-
ssl-cipher-list'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o C Hamano
Merge branch
'
dl
/
subtree-avoid-tricky-echo'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
Merge b
r
anch 'jk/skip-http-
t
ests-under-no-c
u
rl'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
Merge bra
n
ch 'dl/subtree-push-no-sq
u
as
h
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
M
erg
e
b
r
anch 's
g
/comple
t
ion-omi
t
-
c
r
edential-helpers'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge b
r
anch 'dl/b
r
anch-error-message'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Third batch for 2
.
5 cycl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
J
u
ni
o
C
Hamano
Merge b
r
anch
'sb/ref-lock-
l
ose-
l
ock-fd'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
H
amano
Me
r
g
e
b
ranch 'k
n
/cat-fi
l
e-lite
r
a
l
ly
'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Hamano
M
erge branch 'nd/d
w
im-wildcards
-
as-
p
a
thspecs'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge b
r
anch 'jc/mer
g
e'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C
Hamano
Merge branch 'ph
/
rebase-i-redo'
commit
|
commitdiff
|
tree
2015-05-19
J
uni
o
C Hamano
Merge branch 'jc/test-prereq-validate'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
M
e
rge
branch 'bc/connect-plink'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Ha
m
a
n
o
M
e
r
ge branch 'jk/
t
es
t
-chain
-
lin
t
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'fg/d
o
cume
n
t-commit-
m
e
s
sage
-
stripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Merge branch 'jk/stash-require-clea
n
-index'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
an
o
Merge branch
'jk/git-no-more-argv
0
-p
a
th-mungi
n
g'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge
b
ranch 'jc/gitignore
-
pr
e
ce
d
ence'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
Merge branch 'nd/diff
-
i-t-
a
'
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Hama
n
o
S
y
nc with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Hamano
Gi
t
2
.
4
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'sb/li
n
e-log-plug-pai
r
d
iff-leak' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C
H
amano
Merge branch 's
b
/test-bitmap-free-at-end' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'nd/
t
1
509-chroot-test' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Hamano
M
e
rge branch 'jk/type-from-string-gen
t
l
y
' into maint
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Ham
a
no
Merge b
r
anch 'ep/fix-test-lib-funct
i
on
s
-report' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Haman
o
M
erge b
r
a
n
ch 'cn/bom-in-gitign
o
re'
into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Hamano
Merge
branch '
j
k/pru
n
e-mtime'
in
t
o maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch
'jk/init-co
r
e-worktree-at-root
'
into
m
aint
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
S
y
nc with 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Juni
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
amano
Merge branch '
m
m
/
usage-log-l-can-tak
e
-
reg
e
x'
i
n
t
o mai
n
t-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hama
n
o
Merge branch 'jc/diff-
n
o-index-d-f' i
n
to maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hama
n
o
Merge branch 'oh/f
i
x
-c
o
nfig-default-us
e
r-name-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
M
e
rge branch 'jc/epochti
m
e-wo-tz' into main
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
S
eco
n
d batch for 2
.
5
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge bra
n
ch
'pt/xdg-config
-
p
ath'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge bra
n
ch 'ep
/
do-not-feed-a-po
i
nter-to-arr
a
y-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge branch 'jc/hash-o
b
j
ect'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge branch 'sb/
p
refix-path-free-resu
l
ts'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Mer
g
e branch 's
g
/completion-no-redundant
-
all-com
m
and
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Mer
g
e branch 'sg/comple
t
e-decor
a
te-full
-
n
ot-long'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge branch 'j
k
/filter-
b
ran
c
h-use-of-sed-on-incomp
l
ete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge branch
'
jc/daemon-no-i
p
v6-for-
2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge
b
ra
n
ch
'jn/clean-use-error-not-fprintf-
o
n-stderr'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'tb/blame-resurrect-
c
on
v
ert-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
b
r
anch '
v
a/fix-git-
p
4-tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branc
h
'ld/p4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
io
C
Hamano
Merge b
r
anch '
j
k/rebase-
q
u
i
et-noo
p
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
b
ranch 'va/p4-client
-
pa
t
h'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'mm/add-p-split-error'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch 'tb/t
0
027-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'ls/p4
-
ch
a
n
g
es
-
block-size'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
M
e
rg
e
b
ranch
'jc/plug-fmt-merge-msg-leak
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch '
n
d/slim-index-pack-m
e
mory-usage'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C H
a
man
o
Mer
g
e branch 'jk/still-inter
e
sting'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge bran
c
h '
j
k/reading-pa
c
k
e
d-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge branch 'lm/squ
e
lch-bg-pro
g
r
e
ss'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge branch 'jk/
s
ha1-fil
e
-reduce-usele
s
s-w
a
rni
n
gs'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge branch 'nd/mul
t
ipl
e
-work-trees'
commit
|
commitdiff
|
tree
2015-05-11
J
un
i
o C
H
aman
o
Merge bran
c
h
'
p
t
/cre
d
ential-xdg
'
commit
|
commitdiff
|
tree
2015-05-07
Junio
C Hamano
tests: skip dav http-
p
ush tests unde
r
NO_EXPAT=N
o
Than
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
aman
o
First batch for
2
.
5
cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Merge branch 'jk/prun
e
-
mt
i
me'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge branch 'mm/usage-log-l-can
-
take-regex'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
H
a
mano
Merge branch
'
ep/fix-test-lib-functions-report'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
H
amano
Merg
e
b
r
anch 'cn/b
o
m-i
n
-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
H
amano
Merge branch 'jc/epoc
h
tim
e
-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge
b
ranch 'nd/t1509-chroot-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bra
n
c
h
'oh/f
i
x-config
-
default-user-name
-
s
e
c
t
ion'
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
i
o
C Ham
a
no
Merg
e
branch 'jk/type-from-s
t
ring-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Ham
a
n
o
Merge branch
'sb/te
s
t-bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
m
a
no
Mer
g
e branch
'l
d
/p4-f
i
l
e
type-d
e
tect
i
on'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch
'ts/checkout-a
d
vice-plur
a
l
'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Haman
o
Merge branch 'jk/i
n
it-core-workt
r
e
e
-
a
t-r
o
ot'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Merge branch
'
mh/show-bran
c
h-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merg
e
bra
n
ch 's
b
/line-log-plug-pairdiff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hama
n
o
Merge bran
c
h 'jc/diff-no-index-d-f
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branc
h
'bc/objec
t
-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Ha
m
ano
daemo
n
: unbreak
N
O_IPV6 bui
l
d regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
Junio C
H
ama
n
o
write_sha1_file(): do not us
e
a
s
e
p
arate
s
ha1[] array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
Junio
C Hamano
G
i
t 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e: deprecat
e
'git m
e
rge <message> HEAD <commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge:
h
and
l
e FETC
H
_HEAD intern
a
lly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
decide if we auto-g
e
nera
t
e the
m
e
s
sa
g
e early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Hama
n
o
m
e
rg
e
:
make collect
_
parents() a
u
to-
g
enerate the merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: extrac
t
p
r
epare_merge_m
e
s
s
age() logic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: narr
o
w scope
of merge_n
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
H
amano
merge: split r
e
duce_pare
n
ts()
o
ut of collect_parents(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merg
e
:
cla
r
i
f
y coll
e
ct_
p
a
rents() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small lea
k
fix an
d
c
o
de simp
l
ificat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C
Hamano
merge: do not
check argc t
o
de
t
e
r
mine n
u
mber
o
f remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C Hamano
m
e
rge: c
l
arify "pulling into void" special case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
t
5
520:
t
est pu
l
ling an octopus i
n
to an unborn branc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
t5520: s
t
yle fix
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Haman
o
merge: s
i
mplify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
a
n
o
merge
:
test the
t
o
p-le
v
el
m
e
r
g
e
driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next