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
Third batch for 2.5 cycle
2015-05-19
J
unio C
Hamano
Th
i
rd batch
f
or 2
.
5
cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge
branch '
s
b/ref-lock-lo
s
e-lock-f
d
'
commit
|
commitdiff
|
tree
2015-05-19
J
unio
C Hamano
Merge branch 'kn/cat-fil
e
-li
t
erally'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
rge branch 'nd/dwim-wi
l
dcards-as-pathspecs
'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Haman
o
Merge branch
'jc/merg
e
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ham
a
n
o
Merge branch '
p
h/reba
s
e-
i
-redo'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
Me
r
g
e
b
r
a
nch
'
j
c/test-pr
e
req-validate'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge
br
a
nch 'bc
/
connect-pl
i
nk'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ham
a
n
o
Merge
branch 'j
k
/t
e
st-chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'fg/documen
t
-commit-message-strippi
n
g'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
erge b
r
anch 'jk/stash
-
require-clean-index'
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
man
o
Merge branc
h
'jk/git-
n
o
-more-argv0-path-mung
i
n
g
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Ham
a
no
M
erge bra
n
ch 'jc/gitignore-
p
receden
c
e'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge bra
n
ch 'nd/
d
iff-i-t-a'
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Ha
m
ano
Sync with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
am
a
no
Git 2
.
4
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'sb/l
i
ne-log
-
plug-pairdi
f
f-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
e
r
ge branch 'sb/t
e
s
t-bitmap
-
free-at
-
end' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hama
n
o
M
erge br
a
nch '
n
d/t150
9
-
chroot-
t
e
st' in
t
o m
a
int
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Haman
o
Merge bran
c
h 'j
k
/
t
y
pe-f
r
o
m-
s
tri
n
g-gently'
into maint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
i
o C Haman
o
Merge branch 'ep/
f
ix-test-li
b
-functions-report
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io
C
Hamano
Merge branc
h
'
cn/bom-in
-
git
i
gnore' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Mer
g
e branch 'jk/pr
u
n
e-mtime' into maint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Ha
m
ano
Merge
bra
n
ch
'jk/init-core-worktree-at-r
o
ot'
into maint
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
m
ano
Sy
n
c w
i
th 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ham
a
no
Git 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge branch 'mm/us
a
ge-log
-
l-can-take-regex' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
M
e
rge
b
ranch 'jc/diff-
n
o-i
n
d
e
x-d
-
f' int
o
main
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch
'oh/fix-config-default-u
s
er-
n
ame-sec
t
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jc/epochtime-wo-tz' into main
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Second batch for 2
.
5 cycl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge
branch 'pt/xdg-config-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'ep
/
do-not-feed-a-pointer-to-array-si
z
e'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Me
r
ge
b
r
anch 'jc/
h
ash-ob
j
ect'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge b
r
anch 'sb/prefix-path-
f
ree-results'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
H
amano
M
er
g
e branch 'sg/completion-n
o
-r
e
dundant
-
all-co
m
m
and
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge bra
n
ch 'sg/complete-decorate
-
full-n
o
t-long'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merge branch 'jk/f
i
lter
-
b
ran
c
h-use-of-sed-on-in
c
omplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge branch 'jc/daemo
n
-no-ipv6-for-
2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Hamano
Merge bra
n
ch 'jn/
c
lean-use-error-not-fprintf-on-
s
td
e
r
r'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merge
branch 'tb
/
b
lame-resu
r
re
c
t-c
o
nver
t
-
t
o-g
i
t'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C H
a
mano
Me
r
ge branch
'
va/fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-05-11
J
un
i
o
C
Haman
o
M
e
r
g
e bra
n
ch 'ld/p4-c
a
se-fold'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
branch 'jk/rebase-quiet-
n
oop'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'va/p4
-
client-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merge
b
ranch 'mm
/
add-p-split-error'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge branch '
t
b/t0027
-
crlf
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
M
erge b
r
anch 'l
s
/p4-changes-block-size'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C
H
amano
Merge bra
n
ch 'jc/plug-fmt-m
e
rge
-
msg-le
a
k'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hama
n
o
Merge
bran
c
h 'nd/slim-index-pack-m
e
mory-
u
sage'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Ha
m
ano
M
e
r
ge branch 'j
k
/still-in
t
e
re
s
ting
'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Ha
m
ano
Merge branc
h
'jk/readi
n
g
-packed-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Mer
g
e
branch 'lm
/
squelc
h
-bg-progress'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C Hama
n
o
Merge
bran
c
h 'jk/sha1-file-reduce-useless-warni
n
gs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
an
o
Merge
b
ranch 'nd/multip
l
e-work-tree
s
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch 'pt/credential
-
xd
g
'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
First batch for 2
.
5 cy
c
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bra
n
ch 'jk/prune
-
mtim
e
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
ge branch
'mm/usage-log
-
l-ca
n
-ta
k
e-regex'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Haman
o
M
erg
e
b
r
an
c
h 'ep/
f
ix-
t
e
st-
l
i
b-functions-r
e
p
o
r
t
'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Merg
e
branch 'cn/bom-in-gitig
n
ore'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branch 'jc/epochtime-wo
-
tz'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
M
e
rge
branch 'nd/t1509-ch
r
oot-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Merge branch 'oh/fix-c
o
nfig-def
a
u
lt-user-name-section'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
M
e
rge
branch 'jk/ty
p
e-from-string-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge br
a
nch 'sb/te
s
t-bit
m
ap-free-at-e
n
d'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge bra
n
c
h
'
l
d
/
p4-filetype-detection'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Ham
a
no
Merge branch 'ts/checkou
t
-advice-
p
lural'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Ha
m
ano
M
e
rge branch
'
jk/init-core-worktree-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Haman
o
Me
r
ge branch 'mh/sh
o
w-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branc
h
's
b
/li
n
e-log
-
plug-pa
i
rd
i
ff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bran
c
h 'j
c
/
d
iff-no-
i
n
d
ex-d-
f
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge bran
c
h 'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Ham
a
no
d
a
emon: unbr
e
ak NO_IPV6 build
regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
J
unio
C Haman
o
write_sha1_fi
l
e
(
)
: do not us
e
a separat
e
sha
1
[
] array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
J
u
n
i
o
C
H
a
mano
G
it 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
H
amano
merge: de
p
recate
'
git
me
r
ge <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
merge: handle
FETCH_HEAD internally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
Hamano
me
r
ge: decide if
w
e a
u
to-
g
en
e
rate the mes
s
a
g
e early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merge:
m
ake collect_paren
t
s
(
)
aut
o
-
g
enerate
the me
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: extra
c
t
p
repare_merge_message() logic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
e
rge
:
narrow s
c
ope
of merge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
mer
g
e:
split reduce_parents() out o
f
collect_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
m
e
rge:
clarify col
l
e
c
t_parents() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
ma
n
o
merge: sma
l
l leakfix an
d
code simpli
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 d
e
termine n
u
mber of rem
o
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge: clari
f
y "pulling into
v
oid" special case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
t
5
52
0
: test
pulling an octopus into an
u
nbor
n
bran
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520:
sty
l
e
f
i
xes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o C Hamano
merge: simplify
c
o
de flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
mer
g
e: test the top
-
l
e
v
el merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
J
unio
C
Ham
a
no
test: validate pr
e
r
equi
s
te
s
syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge branch 'mh/multimail-
r
enewal'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge
branch 'mg/show-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
H
amano
Mer
g
e branch 'nd/version
c
m
p
-prereleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
H
amano
Merge
branch 'mg
/
s
tatu
s
-v-v'
commit
|
commitdiff
|
tree
2015-04-27
J
u
n
io C Hamano
S
y
nc with 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C Hamano
Git 2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Juni
o
C
H
a
m
ano
Merge branc
h
'tb/co
n
nect-ipv6-par
s
e-fix' into ma
i
nt
commit
|
commitdiff
|
tree
next