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 'ld/p4-editor-multi-words'
2015-05-11
Junio C Ham
a
no
Merge b
r
a
nch
'
pt/xdg-
c
onfig-pat
h
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge branch 'ep/do-not-feed-a-pointer-to
-
a
rray-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bra
n
c
h 'jc/ha
s
h
-obje
c
t'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'sb/prefix-p
a
th-free-results'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'sg/
c
omple
t
ion-no
-
r
e
dundant-all-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Ha
m
ano
Merge branch 'sg/comp
l
ete-decorate-full-n
o
t-lon
g
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
io C
H
amano
Merge
branch 'jk/f
i
lte
r
-branch-use-of-sed-on
-
i
ncom
p
lete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge
bra
n
ch 'jc
/
daemon-no-ipv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Mer
g
e
branch 'jn/clean-use-e
r
r
o
r-not
-
fprintf-on-s
t
derr'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
ama
n
o
Merge
b
ranch 'tb
/
blame-resurre
c
t
-
co
n
vert-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
M
erge b
r
anch
'
va/fix-git-p4-te
s
ts'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge b
r
anch
'ld
/
p4-
c
ase-
f
old'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge
b
ranch
'
jk/reba
s
e-
q
ui
e
t-noop'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch
'
va/p4-client-path
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge branch 'mm/add-p-spli
t
-err
o
r'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
M
erge branch 't
b
/t00
2
7-crl
f
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bran
c
h 'ls/p4-changes
-
block-size'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
H
amano
Merge branch
'jc/plug-fmt-me
r
ge-m
s
g-leak'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge
b
r
anch
'
nd/
s
lim-i
n
d
ex-p
a
ck-memory-u
s
age'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge br
a
n
ch 'jk/still-interesting'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C
H
a
mano
Merge
b
ranch '
j
k/
r
eading-packe
d
-
r
e
fs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge br
a
nch 'lm/squelch-bg-progress'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge bra
n
ch
'jk/s
h
a1-file-re
d
u
ce
-
useless-warnings'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
H
amano
Me
r
ge br
a
nch '
n
d/mu
l
tipl
e
-work
-
t
rees'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge branch 'pt/credentia
l
-
xdg'
commit
|
commitdiff
|
tree
2015-05-07
J
u
n
i
o
C Hamano
test
s
:
s
kip da
v
h
t
t
p-push
tests
u
nd
e
r NO_EXPAT=
N
oThanks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
F
irst batch fo
r
2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merg
e
branch 'jk
/
prune
-
mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Me
r
ge branch 'mm
/
u
sage
-
log-l-can-take-re
g
ex'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge
b
ranch 'ep/fix-test-l
i
b-functi
o
ns-report'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
bran
c
h 'cn/bom-in-gitigno
r
e'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Ham
a
no
Merge branc
h
'jc/epochtime-wo-t
z
'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merg
e
branch 'nd/t1509-
c
hroot-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge branch 'oh/fix-co
n
fig-
d
efau
l
t-user-name-section'
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
io C Hamano
Merge
b
ranch '
j
k/type-
f
rom-st
r
ing
-
gently'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
H
amano
M
erge branch
'sb/test-bitmap-free
-
at-end'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'ld
/
p4-filetype-d
e
tection'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Merge branch
'
ts
/
checkout-advice-pl
u
ral'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge branch '
j
k/init-core-worktree-at
-
root'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
M
e
rge branch 'mh/sho
w
-
b
ranch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
ranch 'sb/line-l
o
g-plug-pairdiff-
l
eak'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge branc
h
'
j
c/diff-
n
o-index-
d
-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
ranch 'bc/o
b
ject-
i
d'
commit
|
commitdiff
|
tree
2015-05-05
Junio
C
Hamano
daemo
n
: unbreak
NO_IPV6 b
u
ild regress
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
wri
t
e_sha1_fil
e
():
d
o not use a
s
e
parate sh
a
1[] array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
Junio C
H
am
a
no
Git
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge
:
deprecate '
g
it merge
<
message> HEAD <co
m
mi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
mer
g
e:
h
a
ndle FETCH_H
E
AD internally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge: deci
d
e if we auto-generate the mes
s
age early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Haman
o
me
r
ge: make collect_parents() auto-generate th
e
merg
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e: extra
c
t
prepare_merge_me
s
sage
(
) l
o
gi
c
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C Hamano
merge:
n
arro
w
s
c
ope of merge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: split reduce
_
p
arents(
)
out of coll
e
c
t_parents
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
un
i
o C Hamano
merge: clarify collect_pa
r
ents(
)
l
ogi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small leakfix
a
n
d
c
ode simplificatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C H
a
mano
merge: do not che
c
k arg
c
to determi
n
e
number
o
f remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merge:
c
larify "pulling in
t
o void" spe
c
ial
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
t
55
2
0
:
t
e
st pulli
n
g an octopus
i
n
to an unborn bran
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Hamano
t55
2
0:
s
t
y
le fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o C
Haman
o
merge: simplif
y
code f
l
ow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
n
o
m
e
r
ge: test the
t
op-le
v
el merge
d
river
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
J
unio C Hamano
test: validate prerequis
t
es synt
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
H
a
mano
Merge branc
h
'mh/
m
ultimail-rene
w
al'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
Ham
a
n
o
Merge branc
h
'
m
g/sh
o
w-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io C Hamano
Merge branch
'nd/versioncmp-pre
r
eleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Mer
g
e branch 'mg/status-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o
C
Ha
m
an
o
S
y
n
c
w
i
th 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C
Hamano
G
it 2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Junio C H
a
mano
Merge
b
r
a
n
ch
'
t
b
/connect-ipv6-parse-fix' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge branch 'ma/b
a
sh-
c
ompletio
n
-leaking
-
x'
into maint
commit
|
commitdiff
|
tree
2015-04-27
J
unio C Hamano
Merge branch '
j
c/push-cert'
i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-04-22
Junio C H
a
mano
ignore: info/ex
c
lu
d
e should trump c
o
re
.
excludesfile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-22
J
u
nio C Hamano
Git
2
.
4
.
0-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio C H
a
mano
Sync with mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Git 2
.
3
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Merge bra
n
c
h
'jk/colors' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Ha
m
ano
Merge branch 'jk/test-annoyances' into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o
C
Hama
n
o
Mer
g
e branch 'pt/enter-repo-c
o
m
ment-
f
ix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
Merge b
r
anch
'
jz/gitw
e
b-conf-
d
oc-
f
ix' int
o
main
t
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
Merge branch 'jk
/
che
r
ry-pick-docfix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Hama
n
o
Merge branch '
i
u/fi
x
-pars
e
-options-h-comment' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
ama
n
o
Merge branch 'jg/cguide-we-cannot-count' into
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hama
n
o
M
e
rge branch 'jk/pack-corruptio
n
-post-mort
e
m'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
uni
o
C Hamano
Merge
branch 'jn/doc-fast-imp
o
rt-no-16-oc
t
opus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hama
n
o
RelNot
e
s: "merge --quiet" ch
a
nge has
b
een reverted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
J
u
nio C Hamano
Hopefully the
last bat
c
h
f
or 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Jun
i
o
C
H
a
mano
Merge branch 'ps/grep-
h
elp-all-callbac
k
-a
r
g'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
i
o
C
Ha
m
ano
Merge bra
n
ch 't
b
/c
o
n
n
ect-
i
pv6
-
parse-fix'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C
Ha
m
ano
Merge branch
'
va
/
fix-
g
it-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge branch 'jc/push-cert'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge
branc
h
'
m
a/bash-completio
n
-le
a
king-x'
commit
|
commitdiff
|
tree
2015-04-20
J
u
nio C Hamano
f
m
t-m
e
rge-msg: plug s
m
all l
e
ak
o
f commi
t
bu
f
fer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-19
Junio C Haman
o
Merge tag '
g
it
g
ui-0
.
20
.
0'
of http:
/
/repo
.
or
.
cz/r/
g
it-gui
commit
|
commitdiff
|
tree
2015-04-16
J
u
n
io C
Hamano
att
r
: sk
i
p
UTF8 BO
M
a
t
the be
g
i
n
ning of the i
n
put file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
con
f
ig: use utf
8
_
b
om
[
] fro
m
utf
.
[ch] in
g
it_parse_source()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Haman
o
utf8-bom: i
n
t
r
o
d
u
ce skip_utf
8
_bom()
h
e
lper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C
Hamano
add_ex
c
l
u
de
s
_from
_
f
i
le: cl
a
rify
th
e
bom s
k
ipping
l
ogic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Ju
n
io C
H
a
mano
Revert "
m
e
r
ge: pass
v
erbos
i
ty fla
g
d
o
wn
t
o
merge-recurs
i
v
e"
commit
|
commitdiff
|
tree
2015-04-15
Junio C
H
amano
parse_date_b
a
sic(): let t
h
e
syste
m
hand
l
e DST
c
onve
r
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
Junio C Ha
m
ano
parse_date_basi
c
(): return earl
y
wh
e
n
giv
e
n a bo
g
us
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next