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 'cb/rebase-am-exit-code'
2015-05-19
Jun
i
o C Haman
o
Third batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
i
o C Hamano
Me
r
ge branch
's
b
/re
f
-lock
-
los
e
-
l
ock-fd
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
Merg
e
branch 'kn/ca
t
-file-literally
'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C
Hamano
Merge b
r
anch 'nd/dwim-wildcard
s
-as-pathspecs'
commit
|
commitdiff
|
tree
2015-05-19
J
uni
o
C Ham
a
no
Merge branch 'jc
/
me
r
ge
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
Mer
g
e
b
ranch 'ph/reba
s
e-i-redo'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
a
m
ano
Merge branch 'jc/test
-
prereq
-
validate'
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
i
o
C Hamano
Merg
e
branch 'b
c
/connec
t
-p
l
i
n
k
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge
b
ranch 'jk/test-chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Me
r
ge bran
c
h 'fg/documen
t
-co
m
mit
-
me
s
sa
g
e-stri
p
p
ing'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Ha
m
ano
Merg
e
branch 'jk/stash-r
e
quire-c
l
e
a
n-index'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Mer
g
e branch 'jk/git
-
no-
m
ore-argv0-p
a
th-munging'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Merge branch 'jc/gitig
n
ore-pr
e
c
e
d
e
nce
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Ha
m
ano
M
erg
e
bra
n
ch 'nd/diff-i-t-a'
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Ha
m
ano
Sync w
i
th 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Hama
n
o
Git 2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hama
n
o
M
er
g
e branch 'sb
/
l
ine-log-plug-pa
i
rdiff-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
mano
Merg
e
branch 'sb/test-bitmap-free-a
t
-end' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
ano
Mer
g
e br
a
nch 'nd/t1
5
09-chroot-t
e
st' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
n
o
Merge branch '
j
k/type-
f
rom-stri
n
g-gently' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'ep/fix-test-lib-functions-report' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C Hamano
Merge b
r
anch
'
c
n
/bom-in
-
gitig
n
ore' into maint
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o
C
H
a
mano
Merge branc
h
'jk/pru
n
e-mtime' into main
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
erge branch 'j
k
/init-
c
ore-
w
orktree-at
-
root' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
io C Hamano
log
:
do not
shorten decoration
n
ames t
o
o early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
i
o C Hamano
l
o
g: decorate HEAD wit
h
branch na
m
e under --dec
o
r
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge
b
r
anch 'mh/write-refs-s
o
on
e
r-2
.
3' into
mh/write
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
M
erge branc
h
'mh/write-refs-sooner-
2
.
2' i
n
to mh/write
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2015-05-11
Jun
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
Junio C Ham
a
no
Git
2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
J
unio C
H
amano
Merge branch 'mm/
u
sage-
l
o
g
-l-can-ta
k
e-regex
'
into mai
n
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merg
e
br
a
nch 'jc/dif
f
-no-index-
d
-f'
i
nto
m
aint-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'oh/fix-co
n
f
ig
-
def
a
ult-user-name
-
section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
a
n
o
Merge branch 'jc/epochtime-wo-tz'
i
nto main
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Ha
m
a
n
o
Second b
a
tch for 2
.
5
c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
amano
Merg
e
b
r
anch
'
p
t/xdg
-
config-path
'
commit
|
commitdiff
|
tree
2015-05-11
J
unio
C Haman
o
Merge bra
n
ch 'ep/do-not-feed-a-poi
n
ter-t
o
-
ar
r
ay-si
z
e'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge branc
h
'jc
/
hash-
o
bjec
t
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge branch '
s
b/prefi
x
-
p
ath-free-results'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge br
a
n
c
h
'sg/co
m
pletion-no-redundant-all-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
mano
Merge b
r
anch 'sg/complete-decorate-
f
ull-not-
l
ong'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C
Hamano
Merge branch 'jk/filter-bra
n
ch-use-of-s
e
d-
o
n-inc
o
mpl
e
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Haman
o
M
e
rge
b
ranch 'jc/daem
o
n-no-ipv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
M
e
r
g
e branch 'j
n
/clean-use-er
r
o
r
-
not-fprintf-on-stderr'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Me
r
ge bra
n
ch
'
tb
/
b
lame-resu
r
rect-con
v
ert-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge branch 'va
/
fix-g
i
t-
p
4-tests'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
H
amano
Me
r
ge branch 'ld/p4
-
case-fold'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
m
a
no
M
erge bran
c
h 'j
k
/
reb
a
s
e-qui
e
t-noop'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Me
r
ge branch
'
va
/
p4-cli
e
nt
-
pa
t
h'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merg
e
branch '
m
m/add-p-split-erro
r
'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C Hamano
Merge
b
ranch 't
b
/
t002
7
-c
r
lf'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
a
mano
Merge branch 'ls/p4-changes-b
l
ock
-
s
i
ze'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
ra
n
ch 'jc/
p
lug-
f
mt-merg
e
-msg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge
b
r
a
nch '
n
d/slim-i
n
dex-pack-memory
-
usage'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge branch
'
jk/s
t
ill-interesting'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hama
n
o
Merge branch 'j
k
/reading-packed-re
f
s'
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
io C Ha
m
ano
Mer
g
e b
r
anch 'lm/squelch-bg-prog
r
ess'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge branch 'jk/
s
h
a
1-file-
r
educe-useles
s
-warni
n
g
s'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Haman
o
Merge branc
h
'
nd/multiple-work-t
r
e
es
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merg
e
bra
n
ch 'p
t
/cre
d
ential-xdg'
commit
|
commitdiff
|
tree
2015-05-07
J
unio C
Ha
m
a
n
o
tests: skip dav http-push tests under N
O
_EXPAT=NoThanks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
First
batch for
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
br
a
nch 'jk/prune-mtime
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
ge branch 'mm/us
a
ge-log-l-can-take-regex'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C H
a
mano
Merge br
a
nc
h
'ep/fix-tes
t
-l
i
b-function
s
-report'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
Hamano
Merge branch 'cn/bom-in-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge branch 'jc/ep
o
chtime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio
C Hama
n
o
M
e
rge b
r
a
n
ch
'nd/t1509-
c
h
r
oo
t
-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge
b
r
anch 'oh/fix-config-def
a
ult
-
user-name-se
c
tion'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge branch
'jk/type
-
from-string-gently'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
Hamano
Merge bran
c
h
'sb/test
-
bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Ha
m
ano
Merge branch 'ld/p
4
-filetype
-
d
e
te
c
ti
o
n'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge br
a
nch
'
ts/checkout-advice
-
pl
u
ral'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
r
g
e b
r
a
n
ch 'jk/init-core-worktree-at-r
o
ot'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
Hamano
Me
r
g
e
branch 'mh/show-
b
ran
c
h
-topi
c
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'sb/line-log
-
plug
-
pairdiff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
Hamano
Merge
b
ranch 'jc/d
i
ff-no
-
index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
ranch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
J
unio C Ha
m
a
no
da
e
m
on
:
unbreak
NO_IPV6
build regre
s
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
J
un
i
o C Ham
a
no
write
_
sha1_f
i
le(): do not
use a separate sha1[] arr
a
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
J
u
nio
C
Hamano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
m
erge:
deprecate 'g
i
t
merge <message> HEAD <com
m
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ha
m
ano
merge: handle FETCH
_
HEAD internally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hama
n
o
merge: decide if we auto-gen
e
rate the mess
a
ge early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
a
m
a
no
merge: make colle
c
t
_parents
(
) auto-
g
ene
r
ate the
merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o C Hamano
merge:
e
xtract pr
e
p
a
r
e
_merge
_
message
(
) logi
c
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merg
e
:
n
a
r
r
ow scope of
m
erge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
mer
g
e:
sp
l
it reduce
_
parents() out of
collect_pa
r
ent
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
a
mano
merge: clarify collect_
p
arent
s
()
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
m
erge: small
l
eakfix a
n
d code simpli
f
ic
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C Ha
m
ano
merge:
d
o not
check arg
c
to determine
n
umber of remot
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C
H
amano
merge: clari
f
y "pulling
i
nto void
"
special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Ham
a
no
t5520: t
e
st pulling an oct
o
pus into an
unbo
r
n branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
t5520: style fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge
:
si
m
plify
c
ode flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
m
e
rge
:
t
e
st the top-lev
e
l
merg
e
driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jun
i
o C Ha
m
ano
test: val
i
date prereq
u
istes syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C H
a
mano
Merge bran
c
h
'mh/multimail
-
re
n
ewa
l
'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Me
r
ge branch
'
mg/show-notes-doc'
commit
|
commitdiff
|
tree
next