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 'jc/diff-ws-error-highlight'
2015-05-19
Junio
C
H
amano
Merge bran
c
h 'nd/dwim-wil
d
cards-as-path
s
pe
c
s
'
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
io
C Ham
a
no
Merge
branch 'jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
i
o
C Hamano
Merge branch 'ph/rebase-i-redo'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
Merge branch 'jc/test-
p
rereq-validate'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Hamano
M
erg
e
branc
h
'bc/connect-p
l
ink'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Mer
g
e bran
c
h 'jk/test-cha
i
n-lint'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C
Ham
a
no
Mer
g
e bran
c
h
'fg/document-commit
-
m
e
s
sag
e
-strip
p
ing'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
rge b
r
anch
'
jk
/
stash-r
e
quire
-
clean-index'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio
C
Ha
m
ano
Merge branch
'
j
k/git-
n
o-mor
e
-arg
v
0
-
path
-
m
u
n
ging
'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C H
a
m
a
n
o
Merge
branch 'jc/g
i
tignore-precedence'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio
C
Haman
o
Merg
e
br
a
nch 'nd/diff
-
i-t-a
'
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Syn
c
with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Hamano
Git 2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C
Hamano
Merge
b
ranch 'sb/line-log-pl
u
g
-pairdiff-
l
eak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
amano
Merge branch 'sb/test-bitmap-fre
e
-at-end' into
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C H
a
mano
Merge branch
'
n
d
/t1
5
09-chroot-tes
t
' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Hamano
Merge branch 'jk/t
y
pe-from-string-gently
'
into maint
commit
|
commitdiff
|
tree
2015-05-13
J
unio C Ham
a
no
M
e
rge branch 'ep/fix-
t
e
s
t-lib-
f
u
n
ctions-report' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio
C
H
a
man
o
Mer
g
e b
r
anch 'cn/bom-i
n
-gitign
o
r
e
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Hamano
Merge branch 'jk/prune-mtim
e
' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
a
no
Merge branch 'jk/
i
nit-core-w
o
r
kt
r
ee
-
at-root' into
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C
H
amano
l
o
g: do not shorten
dec
o
ra
t
i
o
n names too e
a
r
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
un
i
o C Ham
a
no
log: deco
r
ate HEAD with branch name und
e
r
--decor
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
a
mano
Merge
b
r
a
nch
'
mh/write-r
e
f
s
-sooner-2
.
3' into mh/w
r
i
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Haman
o
Merge
b
r
anc
h
'm
h
/
write-re
f
s-sooner-2
.
2
'
into mh/write
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
i
o C Hamano
Merge
branc
h
'maint'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Sync with
2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
G
it 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
a
n
o
Me
r
ge b
r
anch
'mm/
u
s
a
ge-l
o
g-l-can-ta
k
e
-regex' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge br
a
nch 'jc/diff-no-index-d-f' into
m
a
i
n
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge bra
n
ch 'oh/f
i
x-config-defau
l
t-user-n
a
me-sect
i
on
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch '
j
c/e
p
ochtime-wo-
t
z' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Second batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
M
e
r
ge branch 'p
t
/
xdg-
c
onfig-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge branch '
e
p/do-
n
ot-feed-a-pointer-
t
o-array-si
z
e'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
mano
Merg
e
br
a
n
ch
'jc/hash
-
object'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'sb/prefix-
p
ath-f
r
ee-results'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C H
a
mano
Merge b
r
anch 'sg/com
p
letio
n
-no-redundant-all-
c
ommand
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge
b
ranc
h
'sg/
c
omplete-decorate-full-not-
l
ong'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
m
ano
Mer
g
e branch 'jc/daemo
n
-no-ipv6
-
for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge b
r
anch 'jn/c
l
ea
n
-us
e
-error-not-fpri
n
tf-on-
s
tde
r
r'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hama
n
o
Merge b
r
anch
'tb/b
l
ame-r
e
s
u
rrect-conve
r
t-
t
o-
g
it'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o C Haman
o
Merge branch 'va/fix-git-p4-te
s
ts'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'l
d
/p4-case-fold
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jk/
r
ebas
e
-
quie
t
-noop
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge branch 'va/p
4
-
c
li
e
nt-path'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hama
n
o
Mer
g
e branch
'mm/a
d
d-
p
-spli
t
-
e
rror'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch
'tb
/
t0
0
27-c
r
l
f
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
aman
o
Merge branch 'ls/p
4
-change
s
-b
l
ock-size'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merg
e
branch 'jc
/
plug-fmt-merge-msg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merge branch 'nd/slim-index-pack-memory-usage'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C
H
aman
o
Mer
g
e branch
'jk/still-interesting'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge br
a
nch 'jk/read
i
ng-packed-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'lm/squel
c
h-bg-progress'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Hamano
Merge b
r
anch 'j
k
/sha1-file-
r
educe-useles
s
-warnings'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C H
a
mano
M
e
rge bran
c
h
'
nd/multip
l
e-work-tree
s
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
io C Hamano
Merge branch 'p
t
/credential-xdg'
commit
|
commitdiff
|
tree
2015-05-07
J
u
nio C Hamano
tests: skip dav
http
-
p
u
s
h test
s
u
n
der NO_EX
P
A
T
=NoT
h
anks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
F
ir
s
t b
a
t
ch for
2
.
5
c
yc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Ham
a
n
o
Merge bran
c
h 'jk/pr
u
ne-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
m
a
no
Merge branch 'mm/usage-log-l-ca
n
-ta
k
e-regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge branch
'
ep
/
f
ix-t
e
s
t-lib
-
fu
n
cti
o
ns-report'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge br
a
nch 'cn
/
bom-in-gitign
o
re'
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
mano
Merge branch 'jc/epochtime
-
wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Merge
b
ranch 'nd/t1509-chro
o
t
-
t
est'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Merge
b
ranch 'o
h
/fi
x
-config-default-user-n
a
me-sect
i
on'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Merge branch 'j
k
/type-from-string
-
g
e
ntly'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge branch 'sb/test-bitma
p
-f
r
ee-at-e
n
d'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branch 'ld/p4-fi
l
etype-det
e
c
tion'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Merge bra
n
ch 'ts/
c
h
e
ckout-advice-plura
l
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge br
a
nch 'jk/init
-
core-worktree-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'mh/show-branch
-
t
opic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
M
e
rge
b
r
anch 's
b
/line-
l
og-plug-pai
r
diff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
M
e
rge
branch 'jc/di
f
f-no-index
-
d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
ama
n
o
Mer
g
e branch 'bc/object-
i
d'
commit
|
commitdiff
|
tree
2015-05-05
J
u
n
i
o C Hamano
daemon: unbre
a
k
NO_IPV6 build
r
egr
e
s
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Ha
m
ano
write_sh
a
1_fi
l
e(): do not use a
s
e
p
arate sha1[] a
r
ray
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Haman
o
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e: dep
r
ec
a
te
'g
i
t m
e
rge
<messa
g
e> HE
A
D <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
ama
n
o
merge:
h
an
d
l
e FETCH
_
H
EAD i
n
ternally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge: decide if we auto-gene
r
ate the messa
g
e early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Ha
m
ano
merge:
make collect_parents(
)
au
t
o-generate the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
extr
a
ct prepare_merge_message() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: narr
o
w
scope of merge_nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge: s
p
lit re
d
uce_parents
(
) out of collect_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
me
r
ge
:
clarify collect
_
parents() lo
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge: smal
l
leakfix and code simplification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
m
erge: do
no
t
check argc to dete
r
mi
n
e
n
u
mb
e
r
of
r
emote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C
Hamano
m
e
rge: clarif
y
"pulling
into vo
i
d" special
c
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C Hamano
t
5
5
2
0
: test
p
ulling an
o
ctopu
s
int
o
an un
b
orn bra
n
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C
H
amano
t5520:
s
t
y
le
fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
a
mano
merge
:
simplify code
f
low
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge:
t
e
s
t the top-level mer
g
e driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C Ham
a
n
o
test:
v
a
l
idate prer
e
quistes syn
t
ax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Ha
m
ano
Merge branch 'mh/m
u
lt
i
mail-rene
w
al'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hama
n
o
Merge branch 'mg/show
-
note
s
-doc
'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
Haman
o
Merge branch 'nd/v
e
rsioncmp-pre
r
eleases'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C H
a
mano
Mer
g
e branch 'mg/status-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Sync with 2
.
3
.
7
commit
|
commitdiff
|
tree
next