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
t4150: am --resolved fails if index has unmerged entries
2015-07-01
Junio C Hamano
G
it 2
.
5
.
0-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-01
Ju
n
io C Hamano
M
er
g
e branc
h
'me/fetc
h
-into-
s
hallow
-
sa
f
ety'
commit
|
commitdiff
|
tree
2015-07-01
Junio C Ha
m
ano
Merge bran
c
h 'j
c
/prompt-docum
e
nt-ps1-stat
e
-
separator'
commit
|
commitdiff
|
tree
2015-07-01
J
unio C Hamano
Me
r
ge
branch 'mm/d
e
scrib
e
-doc'
commit
|
commitdiff
|
tree
2015-07-01
Junio
C
H
a
m
ano
Merge branch 'd
a
/mergeto
o
l-winm
e
rge'
commit
|
commitdiff
|
tree
2015-06-28
Junio C
Hamano
Sy
n
c with maint
commit
|
commitdiff
|
tree
2015-06-26
Juni
o
C Hamano
Merge
b
ranch 'jk/stash-require-clean-index' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-26
J
u
nio C
H
amano
Merge branch 'cb/arr
a
y-size' into maint
commit
|
commitdiff
|
tree
2015-06-25
Junio C Hamano
Git 2
.
5
.
0
-r
c
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-25
Junio C Hamano
Merge branc
h
'cn/cv
s
import-
p
erl-update'
commit
|
commitdiff
|
tree
2015-06-25
Junio C
H
amano
Merge branch 'cb/arr
a
y-size'
commit
|
commitdiff
|
tree
2015-06-25
Junio C Hamano
Sync wi
t
h
2
.
4
.
5
commit
|
commitdiff
|
tree
2015-06-25
J
un
i
o
C Hamano
Git 2
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-25
Juni
o
C Ham
a
no
Merge branch
'
sg/m
e
rge
-
summary-confi
g
' int
o
maint
commit
|
commitdiff
|
tree
2015-06-25
Junio C Hamano
Merge branch '
j
k/m
a
ke-fix-dependencies'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-25
Junio C H
a
m
a
n
o
Merge branch 'sb/pack-protoc
o
l-mention-smart-http'
.
.
.
commit
|
commitdiff
|
tree
2015-06-25
Junio C
H
am
a
no
Merge bra
n
ch 'jk/die-on-bogus-w
o
r
k
tree-late' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-25
Junio C Hamano
Merg
e
branc
h
'pt/pull-tags-error-diag' into maint
commit
|
commitdiff
|
tree
2015-06-25
Junio C
Ha
m
ano
Merge br
a
nch
'
jk/color
-
d
i
ff-p
l
ain
-
is-context' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-25
Junio C Hamano
Merge
b
ranch 'jk/diagn
o
se-conf
i
g
-mma
p
-fail
u
re' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-25
J
uni
o
C Hamano
Merge branch 'jk/sq
u
e
lch-missing-link-warning-f
o
r
-
unreachabl
.
.
.
commit
|
commitdiff
|
tree
2015-06-25
Junio C Hamano
Merge bra
n
ch
'
mm/rebase-i
-
post
-
rewrite-exec
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-25
Junio C Hamano
Merge branch '
n
d/d
i
ff-i-t-a'
commit
|
commitdiff
|
tree
2015-06-24
Junio C Hama
n
o
Nint
h
b
atch for 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-24
Junio
C Haman
o
Me
r
ge b
r
anch 'jk/stash
-
require
-
clean-index'
commit
|
commitdiff
|
tree
2015-06-24
J
unio C
Hamano
Merge
branch 'pa/auto-gc
-
mac-osx'
commit
|
commitdiff
|
tree
2015-06-24
Junio
C Ham
a
no
M
e
rge branch
'pt/t
0
302
-
ne
e
ds-sanity'
commit
|
commitdiff
|
tree
2015-06-24
Junio C Ha
m
a
no
Merg
e
branch 'l
d
/p4-ch
a
ng
e
s
-block-size'
commit
|
commitdiff
|
tree
2015-06-24
Junio C Hamano
Merge b
r
anch 'fk/doc-format-patch-vn'
commit
|
commitdiff
|
tree
2015-06-24
J
unio C Hamano
M
e
rge branch
'
sg
/
commit-cleanup-
s
c
issors'
commit
|
commitdiff
|
tree
2015-06-24
Junio C
H
a
mano
Merge branch 'jk/index-pac
k
-r
e
duce-recheck'
commit
|
commitdiff
|
tree
2015-06-24
Jun
i
o C Hama
n
o
M
e
r
g
e
branc
h
'af/tcsh-completion-noc
l
obber'
commit
|
commitdiff
|
tree
2015-06-24
J
u
n
i
o
C H
a
mano
Merge bran
c
h 'mh/r
e
po
r
ting-
b
r
o
ken
-
refs-from-for-e
a
ch
.
.
.
commit
|
commitdiff
|
tree
2015-06-24
Junio C Hamano
M
e
r
g
e branc
h
'sg
/
completion-co
m
mi
t
-c
l
eanup'
commit
|
commitdiff
|
tree
2015-06-24
Junio C Hamano
Merge branch 'pt/a
m
-ab
o
rt-f
i
x'
commit
|
commitdiff
|
tree
2015-06-24
Ju
n
io C Hamano
M
erge branch
'
nd/u
n
tra
c
ked-cache'
commit
|
commitdiff
|
tree
2015-06-24
Junio
C Ha
m
ano
Me
r
ge branch
'mh/f
s
ck-reflog-entries'
commit
|
commitdiff
|
tree
2015-06-24
Jun
i
o C Hamano
Merge
b
r
a
n
ch
'js/sleep-
w
ithout-select'
commit
|
commitdiff
|
tree
2015-06-24
Junio C Hamano
Merge branch 'es/utf8-st
u
p
i
d-com
p
iler-work
a
round'
commit
|
commitdiff
|
tree
2015-06-24
Junio C Ha
m
a
n
o
Merge
b
ranch 'rl/am-3way-co
n
fig'
commit
|
commitdiff
|
tree
2015-06-24
Juni
o
C
Hamano
Merge
branch 'jc/l
l
-m
e
rge-expos
e
-path'
commit
|
commitdiff
|
tree
2015-06-24
Jun
i
o C
H
amano
Merge branc
h
'es/osx-heade
r
-pollutes
-
ma
s
k-mac
r
o'
commit
|
commitdiff
|
tree
2015-06-24
Junio
C
H
amano
Merge bra
n
ch 'es/configure-getdelim'
commit
|
commitdiff
|
tree
2015-06-24
J
un
i
o
C
Hamano
Mer
g
e branch '
p
t/pull
-
optparse'
commit
|
commitdiff
|
tree
2015-06-24
Junio C Hamano
Merge branc
h
'qn/
b
lame
-
sho
w
-e
m
ail'
commit
|
commitdiff
|
tree
2015-06-24
Junio C
H
am
a
no
Merge b
r
a
n
ch
'
jc/do-not-feed-tags
-
to-cl
e
ar-
c
ommit-marks'
commit
|
commitdiff
|
tree
2015-06-24
Junio C Hamano
M
erge branch
'es/send-email-sendmail-ali
a
s'
commit
|
commitdiff
|
tree
2015-06-24
Junio C Hamano
M
erg
e
branch 'jc/apply-rejec
t
-noop
-
hunk'
commit
|
commitdiff
|
tree
2015-06-23
Junio C Hamano
Revert "diff-lib
.
c: ad
j
ust position of
i
-t-a entries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-16
Junio C Hamano
Eighth ba
t
ch for 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-16
Junio C Hamano
Sync with
2
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-16
Junio C Hamano
Git 2
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-16
J
u
nio C Hamano
Merge
branch
'
jk/clone-dissociate'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-16
J
unio C H
a
mano
Merg
e
branch 'sb/submodule-doc-intro' into maint
commit
|
commitdiff
|
tree
2015-06-16
Ju
n
io
C
Hamano
Merge branch '
s
b
/
g
lo
s
sary-submodule' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-16
Junio C
Ham
a
no
Merge
b
ranch 'ah/usage-strings' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-16
Jun
i
o
C Hamano
Merge branch 'mc
/
commi
t
-
doc-grammofix'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-16
J
u
ni
o
C Hamano
M
e
rge branch 'r
s
/janitorial' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-16
Junio C Hamano
Merge
branch 'sb/tes
t
-
b
i
t
map-free
-
at-end'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-16
Juni
o
C Hamano
M
e
rge branch 'dt/cle
a
n-pathspec
-
fil
t
er-then-ls
t
at
'
.
.
.
commit
|
commitdiff
|
tree
2015-06-16
Junio C Hamano
M
erge
b
ranc
h
'jk
/
http-
b
ackend-deadlo
c
k' into maint
commit
|
commitdiff
|
tree
2015-06-16
J
u
nio
C
Hama
n
o
Merge branch 'jh/filter-empty-contents' into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-16
Junio C Hamano
M
erge branch 'jk/stash-options' into maint
commit
|
commitdiff
|
tree
2015-06-16
J
u
nio C Hamano
Merge branch 'mm/log-fo
r
mat
-
raw-doc
'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-16
J
u
nio
C
Hamano
M
erge
bran
c
h 'ep/do-not-feed
-
a-poi
n
ter-to-ar
r
ay-s
i
z
e
.
.
.
commit
|
commitdiff
|
tree
2015-06-16
Junio C Ham
a
no
Merge branch '
n
d
/slim-index-p
a
ck-memory-usage'
commit
|
commitdiff
|
tree
2015-06-16
J
uni
o
C
Haman
o
Me
r
ge
branch
'
sb/p
a
ck-pr
o
tocol-men
t
ion-smart-http'
commit
|
commitdiff
|
tree
2015-06-16
Junio C Haman
o
Merge branch 'jk
/
m
a
ke-fix-de
p
end
e
nci
e
s'
commit
|
commitdiff
|
tree
2015-06-16
Junio C
H
amano
Merge b
r
anch 'jk/die-on-
b
ogus-worktree-late'
commit
|
commitdiff
|
tree
2015-06-16
J
un
i
o C H
a
mano
Merge branch 'sg/merge-summary
-
c
onfi
g
'
commit
|
commitdiff
|
tree
2015-06-16
Junio C Ha
m
ano
Merge b
r
anch 'a
h
/se
n
d-email-se
n
dm
a
i
l-alia
s
'
commit
|
commitdiff
|
tree
2015-06-14
J
u
nio C Ha
m
ano
Merge ta
g
'l10
n
-
2
.
4-maint-de-updates
'
of
gi
t
://github
.
.
.
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
S
eco
n
d ha
l
f of s
e
v
e
nth batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-11
J
un
i
o C
Ham
a
no
Merge br
a
nch 'tb/c
o
mplete-sequencing'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
H
a
m
ano
M
e
rge bra
n
c
h
'jk/squelch-m
i
ssing-link-war
n
ing-for-unr
e
achable'
commit
|
commitdiff
|
tree
2015-06-11
Junio C H
a
mano
Merge branch 'pt/pul
l
-t
e
sts'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio
C
Hamano
Merge branch 'sb/glo
s
sary
-
submo
d
ule'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
H
a
m
ano
Merge branch 'sb/submodule-
d
oc-intro'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch 'jk/diagnose-
c
o
nf
i
g-mma
p
-fai
l
ure'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Haman
o
Merge
branc
h
'mt/p4-
d
ep
o
tFile-
a
t-version'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Me
r
ge branch 'mh/verify-lock-e
r
ror-r
e
port'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hamano
Merg
e
branch '
j
k
/color-diff-plain-is-cont
e
xt'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
Hamano
Merge branch 'jk/clone-
d
issociate'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio C
H
a
m
a
no
M
erge
b
r
anc
h
'jc/diff-
w
s-error
-
highlight'
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
S
y
nc with
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Git 2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
The fi
r
st half of the seve
n
th batch
for 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Merge bra
n
ch
'
ld/p4-edi
t
or-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ha
m
ano
M
e
rge branch
'bc/obj
e
ct-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'jk/at
-
push
-
sha1
'
commit
|
commitdiff
|
tree
2015-06-05
J
uni
o
C
H
a
m
ano
Merge
b
ran
c
h '
d
l
/branc
h
-
e
rror-m
e
s
s
a
g
e' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Merge br
a
nch 'jk
/
skip-http-te
s
ts-under-no-curl'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
M
erge
branc
h
'ps/doc-packfile-vs-
p
a
c
k-f
i
le' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ran
c
h
'fg
/
document-
c
ommit-mess
a
ge-
s
t
ripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge b
r
anch 'jk/rere
r
e-
f
orget-check-ena
b
led' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erg
e
bran
c
h 'pt/pu
l
l-log-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ra
n
c
h 'p
t
/pull-ff-vs-merge-ff' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Me
r
ge br
a
nch
'rs/plug
-
leak-in-pack-bitmaps' into
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
a
m
a
no
Merge br
a
nch 'ja/tuto
r
ial-
a
sciidoctor-fix' in
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
M
er
g
e b
r
anch 'jk/stripspace-
a
sciidoctor-
f
i
x' into maint
commit
|
commitdiff
|
tree
next