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
Second half of seventh batch
2015-06-11
Junio C Ham
a
no
Second half
of
seventh 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 bran
c
h
'
tb/complete-sequenci
n
g'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
H
a
mano
M
e
rge
b
ranch 'jk/s
q
u
e
lch
-
mi
s
sing-l
i
n
k
-
w
ar
n
i
ng
-
for-unreacha
b
le'
commit
|
commitdiff
|
tree
2015-06-11
Junio C H
a
mano
Merge branch
'
p
t/pull-tes
t
s'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge b
r
anc
h
's
b
/glossary-submodu
l
e'
commit
|
commitdiff
|
tree
2015-06-11
J
unio
C Ham
a
no
Merge bra
n
ch 'sb/sub
m
od
u
le-doc-intro'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge bran
c
h 'jk/dia
g
nose-
c
onf
i
g-
m
map-failure'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch
'
mt/p
4
-depotFile-at-
v
ersion'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Haman
o
Merge branch 'mh/verify-lock-error-repo
r
t'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio C H
a
mano
Merge branch
'jk/color-
d
iff-plai
n
-is-context'
commit
|
commitdiff
|
tree
2015-06-11
J
unio
C
Hamano
Merge b
r
anch 'jk/clone-dissociate'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
Hamano
Merge branch 'jc/diff-ws
-
error-
h
ighlight'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Haman
o
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Git
2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o
C
H
a
m
ano
The fi
r
st
h
a
lf
of the
seve
n
th batch for
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
H
a
mano
Merge branch 'l
d
/p4-editor-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
r
g
e
branch 'bc/objec
t
-id'
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branch 'jk/at-push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Mer
g
e
branch 'd
l
/branch-erro
r
-message' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branch 'j
k
/skip-ht
t
p-t
e
sts-under-no-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge branc
h
'ps/doc-
p
ack
f
ile-vs-pack-file' i
n
to
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge
b
ranch 'fg
/
d
ocument-
c
o
m
m
i
t-message-strip
p
ing
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
M
erge branch 'jk/re
r
ere-forget-check-enabled'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merg
e
branch '
p
t/pull
-
l
og-
n
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge br
a
n
c
h
'
pt/pull-
f
f-vs-merge-ff'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'rs/
p
lu
g
-leak-in
-
pa
c
k-bitmaps' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
Ha
m
an
o
Me
r
ge b
r
anch 'ja/
t
u
t
orial-
a
sciidoct
o
r
-
fix' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branch '
j
k
/
stripspace-asciido
c
t
or-fix
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hama
n
o
Merg
e
bra
n
ch
'jk/asciidoc-mar
k
up-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
M
e
r
ge branch 'ps/
b
undle-verify-arg'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'mh/writ
e
-refs-sooner-2
.
4' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ham
a
no
Merg
e
branch 'm
h
/
r
ef-di
r
ectory-
f
ile
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'mg/
l
og-de
c
orate-HEAD' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Ha
m
a
no
Merg
e
branch 'sb/t1020
-
cleanup'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch 'jc/gitignore-precedence' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch '
b
c/connect-plink
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'ph/
r
ebase-i-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
M
e
r
g
e
branch
'
jk
/
add-e-kill-editor' i
n
to m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch 'mh/
c
l
o
ne-verbosity-fix'
i
nto m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
M
e
rge
b
ranch 'jk/sha
1
-
f
i
l
e-
r
educe-useless-warni
n
g
s
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Me
r
ge branch 'tb/blame-resurrect-convert
-
to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
a
nch '
j
c/plug-
f
mt-
m
erge-m
s
g-leak' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge branch 'pt/xdg-confi
g
-path' into
m
aint
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Sixth batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Haman
o
Merge branch 'sb/test-b
i
tmap-free-at-end'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o C Hamano
Merge branch 'mm/
r
e
base-i-post-rewr
i
te
-
exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Ha
m
ano
Merge branch 'fm/fetc
h
-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merg
e
branch 'sg
/
help-g
r
oup
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Me
r
ge
b
ranch 'm
m
/log-format
-
raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
br
a
nc
h
'dt/cat-file-f
o
llow-
s
ymlinks
'
commit
|
commitdiff
|
tree
2015-06-01
J
uni
o
C
Hamano
Merg
e
branch 'rs
/
ja
n
itorial'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Mer
g
e bran
c
h
'jk
/
stash-optio
n
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'da/mergetool-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Ham
a
no
Merg
e
branch 'mc/commit-d
o
c-grammo
f
i
x
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
M
e
rge
branch 'jh/
f
ilt
e
r-empty-cont
e
nts'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
g
e
branch 'ah/usage-
s
tr
i
ngs'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
mano
M
erge branch '
j
k
/http-backend-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io C Ha
m
an
o
Merge branch 'dt/clean-pathspec-filter-the
n
-lstat'
commit
|
commitdiff
|
tree
2015-06-01
J
eff King
suppress e
r
r
ors on m
i
s
s
in
g
UNINTERESTING l
i
nks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jef
f
King
sil
e
n
c
e b
r
oken l
i
n
k warnings with
r
evs->igno
r
e_missing_links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Je
f
f King
a
d
d
quieter ve
r
sions of parse_{tree,co
m
m
i
t}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Thomas Braun
completion: sug
g
est sequ
e
ncer co
m
m
a
nds fo
r
revert
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Stefan Beller
glossary: add "remote",
"
submodule", "superproject"
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5520:
c
heck reflog act
i
on in fast-for
w
a
r
d me
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
1:
t
est --dr
y
-ru
n
doe
s
not
make any cha
n
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5520: test --rebase failu
r
e on
u
nbor
n
bran
c
h with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
0
:
t
e
st --rebase
w
ith
m
ultipl
e
branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5
5
20: test work
t
ree fast-f
o
rwa
r
d when fetch updat
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test for fa
i
lure if index has unre
s
olved
en
t
r
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
S
tefan Be
l
ler
submodule doc: r
e
order introduc
t
o
r
y par
a
graphs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
unio
C
Ham
a
no
xmmap(): drop "Ou
t
of
m
emory?"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff
K
i
n
g
config
.
c
:
rewrite ENODEV int
o
EISDIR when mmap fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c
:
a
v
oid xmmap error
m
essages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
eff Ki
n
g
config
.
c: fix mmap leak whe
n
writing config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff Kin
g
read-cache
.
c
:
drop PROT_WRITE
from mma
p
of index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torroja
p4: retrieve
t
he right re
v
ision of the f
i
le in
U
TF
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
ich
a
el H
a
ggerty
ref_transact
i
o
n_commit(): do not capi
t
ali
z
e
e
r
r
or messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ael Haggerty
verify_lock():
d
o not capitali
z
e
error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mi
c
ha
e
l Haggerty
ver
i
f
y_lock(): re
p
ort errors via a strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff
.
h
: r
e
n
am
e
DIFF_
P
LAIN color s
l
o
t
t
o DIFF_CONTE
X
T
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
ef
f
Ki
n
g
diff
:
accept co
l
or
.
d
i
ff
.
context as
a
synonym for
"
plain"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
Merge branch '
n
d/un
t
racked-cache
'
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff K
i
ng
t
7
063:
h
ide st
d
err
from setup
inside p
r
ereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michae
l
Haggerty
v
e
rify_lo
c
k(): on e
r
rors, let the
c
a
l
l
e
r
u
nlock
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Hagg
e
r
ty
verify_
l
o
c
k():
return 0/-1 rather than struct ref_
l
oc
k
*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
ing
c
lone: reorder --dis
s
ociate and --ref
e
rence op
t
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
K
ing
cl
o
ne: use OPT_ST
R
ING_LIST for --referen
c
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
diff
.
c
: --ws-error-highlight=<kind
>
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
d
i
ff
.
c: add emi
t
_
d
e
l
_line() and emit_context_lin
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
Sync w
i
th 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C Ham
a
no
G
it 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C H
a
ma
n
o
Merge bran
c
h 'jk/s
t
i
l
l-interesting' in
t
o
m
aint
commit
|
commitdiff
|
tree
2015-05-26
J
un
i
o C Ha
m
a
n
o
Merge branch 'jc/hash-ob
j
e
c
t'
i
nt
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge b
r
anch '
j
k
/
re
b
ase-quiet-
n
o
op' into main
t
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Merge
b
r
a
nc
h
'
sg/comple
t
e-d
e
corate-
f
u
l
l
-not
-
l
o
ng'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk/filter-branch-use-of-sed-o
n
-incom
p
lete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Merge branc
h
'j
c
/daem
o
n-no-ipv6
-
for-2
.
4
.
1'
i
nto
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
branch 'jk/stash-requi
r
e-clean-in
d
ex' into maint
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
i
o
C Hamano
Merge br
a
nch 'jk/git-no-more-argv0-pat
h
-munging'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C
H
am
a
no
Fifth bat
c
h for 2
.
5
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next