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 'rh/test-color-avoid-terminfo-in-original-home'
2015-05-19
Junio C
Hamano
Merge branch 'jc/test-p
r
ereq-valid
a
te'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Mer
g
e
branc
h
'bc/connect-
p
link'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hama
n
o
Merge
branc
h
'jk/te
s
t
-
chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hama
n
o
Merge b
r
an
c
h 'fg/docume
n
t
-c
o
mmit-m
e
ssage-stri
p
p
i
ng'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Haman
o
Merge branch 'jk/st
a
s
h-require-clean-index'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
Merge bra
n
ch 'jk/git-no-more
-
argv0-path-mung
i
n
g
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Haman
o
Merge branch
'
jc/gitignore-p
r
e
cede
n
ce
'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Ham
a
no
M
e
rge bran
c
h 'nd/diff-i-t-
a
'
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
m
ano
Sync
with 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
H
amano
Merge branch 'sb/line-log-p
l
u
g
-pai
r
diff-leak'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
mano
M
erge branch 'sb/tes
t
-bitmap-fre
e
-a
t
-end' into main
t
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C
H
amano
Merge branch 'nd/
t
1509-chroot-test' into main
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'jk/type-fr
o
m-string-gently' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Hamano
Me
r
ge branch '
e
p/fix-t
e
st-lib-funct
i
ons
-
report
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
Merge branch
'
cn
/
bo
m
-i
n
-git
i
gnore' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Hamano
M
erg
e
branch 'jk
/
prune-mti
m
e' into
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
amano
Merge branch
'
jk/i
n
it-core-wor
k
tree-at-r
o
ot
'
into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
amano
log: do
not shorten
decoration names too early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
log: de
c
orate H
E
AD with branch name und
e
r --d
e
corate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
Merge br
a
n
c
h 'mh/write-ref
s
-soon
e
r-2
.
3' into m
h
/
w
r
i
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Ham
a
n
o
Merge branch 'mh/write-
r
efs-soon
e
r-2
.
2
' into
m
h
/write
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
S
ync wit
h
2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branc
h
'mm/
u
sa
g
e
-log-l-ca
n
-t
a
ke-
r
e
g
ex' in
t
o maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
M
e
rge branch 'jc/
d
i
f
f-
n
o-index-d-f' i
n
to maint-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge bran
c
h '
o
h/fix-config-defaul
t
-use
r
-name-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge branch '
j
c/
e
pochtime-w
o
-
t
z
'
i
n
t
o maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
S
econd b
a
t
ch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge branch 'pt/xdg-config-path
'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C
H
amano
Me
r
g
e branch 'ep/do-not-feed-a-pointer-to-array-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Me
r
ge br
a
nch 'jc/hash-objec
t
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
r
ge
b
ranch '
s
b
/p
r
e
fix-path-f
r
ee-resu
l
ts'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge br
a
nch 'sg/completion-no-redund
a
nt-
a
ll-com
m
and
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge branch 'sg/complete
-
decorate-full-not-long'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branc
h
'jk/
f
i
lter-branch-use-of-sed-on
-
incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
amano
Merge bran
c
h 'jc/daemon-no-ipv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
branch 'jn/clean-use-e
r
r
o
r-not-fprintf
-
on-stderr'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
amano
Merge branch 'tb
/
blame-r
e
s
urre
c
t-convert-t
o
-git'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merge br
a
nch 'va/fi
x
-gi
t
-
p4
-
tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge bra
n
c
h
'l
d
/
p
4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
J
uni
o
C Ha
m
ano
Merge branch '
j
k/
r
ebase-quiet-noop'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'va/p4-
c
l
i
e
n
t-path'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
M
e
rge
b
ranch
'mm/
a
d
d
-p-s
p
lit-error'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Haman
o
M
erge bra
n
c
h
'tb/t0
0
27-cr
l
f'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
M
e
r
g
e bra
n
ch 'ls/p
4
-c
h
anges-
b
lock-size'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge branch
'
jc/plug-fm
t
-merge-m
s
g-leak'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Me
r
ge branch 'n
d
/slim-index-pa
c
k
-
m
e
mory-usage'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge branch 'jk/still-interesting'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch
'
jk/reading-pac
k
e
d-refs
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch '
l
m/
s
quelch-bg-progress'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
branch '
j
k/sha1-file
-
redu
c
e-useless-warn
i
ng
s
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge
b
ranch
'nd/multipl
e
-
w
o
rk-
t
ree
s
'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Mer
g
e branch 'pt/creden
t
ial-x
d
g
'
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
tests:
skip dav http-push tests
u
n
der NO_EXPAT
=
NoTh
a
nks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
First ba
t
c
h for 2
.
5
c
ycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
M
e
rge branch 'j
k
/prune-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
m
ano
Merge bran
c
h 'mm/
u
sage-log-l-can-take-regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge b
r
anch 'ep/
f
ix-t
e
s
t-lib-fun
c
tions
-
r
eport'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Ham
a
no
M
e
rge bran
c
h 'cn/
b
om-in-gi
t
igno
r
e'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge br
a
nch 'jc/epochtime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Me
r
ge branc
h
'n
d
/t1509
-
chroot-test'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
M
erge
branch 'oh/fi
x
-co
n
fig
-
default-us
e
r-n
a
me-section'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
man
o
Mer
g
e b
r
anch 'jk/type-from-string-g
e
ntly'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
H
aman
o
Merge branch 'sb/te
s
t-bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
branch 'ld
/
p4-filetype-
d
etec
t
i
o
n'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge branch 'ts/ch
e
c
k
out-advice
-
plural'
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
m
ano
M
erge b
r
anch 'jk/i
n
it-core-wor
k
tree-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
n
o
Merge
b
ran
c
h
'
mh/show-b
r
anch-topic'
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
i
o C
Hamano
Merge
branch 'sb
/
line-log-plug-pai
r
diff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C Hamano
Merg
e
br
a
nch
'
jc/diff
-
no-index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
g
e branc
h
'b
c
/object-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
d
aemo
n
: unb
r
ea
k
N
O
_IPV6 build
r
eg
r
ession
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Juni
o
C Hamano
wr
i
te_sha1
_
file(): do not use a s
e
para
t
e
sh
a
1[]
arra
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
J
u
n
io
C Hamano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: depr
e
c
ate '
g
it merge
<message
>
HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
ama
n
o
merge: handle FE
T
CH_
H
EAD interna
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: decide if we auto-generate the
message ear
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C
H
a
mano
m
e
r
ge: make
c
ollec
t
_parents(
)
auto-gene
r
a
t
e the mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Haman
o
m
e
rge:
extr
a
ct prepare_merge_m
e
s
s
ag
e
() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C
Hamano
me
r
g
e
: na
r
row
scope of merg
e
_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Ham
a
no
merge
:
split r
e
du
c
e_parents(
)
out of co
l
lect_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge
:
cla
r
ify collect_pare
n
ts() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small
l
eakfix and
cod
e
s
i
mpl
i
ficatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: d
o
n
o
t
check
argc to deter
m
i
n
e number of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merge
:
clarify "pul
l
ing
int
o
v
oid"
sp
e
cial case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520: test pulling
a
n o
c
topus i
n
to an u
n
b
orn b
r
anch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520
:
style fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: s
i
mplif
y
code f
l
o
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: test the top-level merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
unio C
Hamano
test: validate
prerequistes sy
n
t
ax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
u
n
io
C
Hamano
M
e
rg
e
b
ranch 'mh/
m
ultimail-
r
enewal'
commit
|
commitdiff
|
tree
2015-04-28
J
un
i
o
C
Hamano
Merge branch 'mg/show-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Me
r
ge br
a
nch 'nd/ver
s
ioncmp-
p
rereleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
H
ama
n
o
Merge
b
ranc
h
'mg/status-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
S
ync with
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio
C
H
amano
Git
2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
J
unio
C Haman
o
Mer
g
e
b
ranch 'tb/connect-ipv6-parse-fix' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Me
r
ge b
r
anch 'ma/bash-completi
o
n-
l
eaking-
x
'
i
n
to maint
commit
|
commitdiff
|
tree
next