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 'mh/verify-lock-error-report'
2015-06-11
Jun
i
o
C Hamano
Mer
g
e branch 'mh/verify-lock-erro
r
-report'
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io C Haman
o
Merge
b
ranch 'jk/
c
olor-diff-plai
n
-is-context
'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Mer
g
e branch 'jk/c
l
one-dissociate'
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C Hamano
M
e
r
g
e branch '
j
c/d
i
ff-ws
-
error-highli
g
ht'
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
S
yn
c
with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
G
i
t 2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Haman
o
The first half
o
f the seventh batch for 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merg
e
branch 'ld/p4-editor-multi-wor
d
s'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
am
a
n
o
Merge branch 'b
c
/
object-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch 'jk/a
t
-push-
s
ha
1
'
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
H
amano
Merge
branch 'dl/br
a
n
ch-error-me
s
sa
g
e' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'jk/ski
p
-http-test
s
-under-no-
c
url'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
Hamano
M
erge branch 'ps/doc-packfile
-
vs
-
pack-file' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'fg/docum
e
nt-comm
i
t-messag
e
-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
M
e
rge bra
n
ch 'jk/rerere-forg
e
t-c
h
eck-en
a
bled' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Haman
o
M
erge branch 'pt/pull-
l
og-n'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
ma
n
o
Merge bra
n
ch 'pt/pul
l
-ff-vs-mer
g
e-f
f
' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C
Hamano
M
erge branch
'r
s
/plug-leak-in-pack-bitmaps' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Me
r
ge branch 'ja/tutorial-asciidoctor-f
i
x
'
into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
Hamano
Merge
b
r
a
n
c
h
'
jk
/
stripspace
-
asciidoctor-fix' i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge bran
c
h 'jk/as
c
iidoc
-
marku
p
-
fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merge branch 'ps/bundle-veri
f
y-a
r
g' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
M
e
rge branc
h
'
mh/wr
i
t
e-refs-so
o
ner-2
.
4' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge
branch 'mh/ref-d
i
rectory-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
n
o
Merge b
r
anch
'
mg
/
log-dec
o
rate-HEAD' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch
'
sb/t1020-cl
e
anup' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ha
m
ano
Me
r
ge branch 'jc/gitigno
r
e-prec
e
dence' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Merge branch '
b
c/connect-plink'
in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
M
erge bran
c
h 'ph
/
reb
a
se-i-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e b
r
a
n
ch 'jk/add-
e
-kill-editor' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge bra
n
ch 'mh/clon
e
-
v
erbosity-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
Hamano
M
e
rge bran
c
h 'jk
/
sh
a
1-
f
ile-re
d
uce-useless-wa
r
nings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Me
r
ge br
a
nch 'tb/bla
m
e-resurrect-c
o
n
v
ert-to
-
git'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
H
a
mano
M
er
g
e branch 'jc/p
l
ug-fmt-me
r
ge-msg-leak' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge br
a
nch 'pt/xdg-con
f
ig-path' into maint
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o C Hamano
Sixth b
a
tc
h
for
2
.
5
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C
H
amano
Merge branch 'sb/test-bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Haman
o
Merge branch 'm
m
/r
e
base-
i
-post-rewri
t
e-exec
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'fm/fetch-
r
aw-
s
ha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
n
o
M
erg
e
bran
c
h 'sg/
h
elp-gr
o
up'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
ama
n
o
Merge branch
'mm/l
o
g-format-raw
-
doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
aman
o
Merge branch 'dt/c
a
t-fil
e
-
follow-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
M
erge
b
ra
n
ch 'rs/janitorial'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Merge br
a
nch
'j
k
/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
mano
Merge bran
c
h 'da
/
mergetool-winmer
g
e'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch '
m
c/co
m
mit-doc-gra
m
mo
f
ix'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io C
H
amano
Merg
e
bra
n
ch 'jh/filter-
e
mp
t
y-
c
ontents'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge
b
ra
n
ch '
a
h/usa
g
e-str
i
ngs'
commit
|
commitdiff
|
tree
2015-06-01
J
u
ni
o
C
H
a
m
ano
Merge branch 'jk/http-backe
n
d-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Mer
g
e bran
c
h 'dt/cl
e
a
n-
p
ath
s
pec-f
i
lter-then-lst
a
t
'
commit
|
commitdiff
|
tree
2015-05-27
Mi
c
hae
l
Haggerty
r
e
f_transactio
n
_commit():
d
o not capitalize e
r
r
o
r me
s
sages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Micha
e
l Haggerty
verify
_
lock
(
): d
o
not capi
t
aliz
e
error m
e
ss
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
veri
f
y
_
lock(): report
error
s
via
a
strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff Ki
n
g
diff
.
h: r
e
name DIFF_PLAIN color
s
l
ot
to
D
I
F
F_CONTEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff:
accept col
o
r
.
d
if
f
.
context as a synonym for "pl
a
i
n
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
M
e
r
ge branc
h
'nd/
u
ntracked-cac
h
e'
commit
|
commitdiff
|
tree
2015-05-27
Jeff Ki
n
g
t
70
6
3
: hid
e
stde
r
r
f
rom setup inside prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
verify_lock(): on errors,
l
et the ca
l
ler unlock
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Hagge
r
ty
verify_lock(): return 0/-1 rather than struct ref_lock *
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
King
clone: reorder
--dissoci
a
te and --
r
eference opti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
King
clone: us
e
OPT_STRING_LIST for --
r
ef
e
re
n
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C
H
amano
diff
.
c:
-
-
ws-e
r
ro
r
-highlight=<ki
n
d> option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C Hamano
diff
.
c:
a
d
d emit_del_line
(
) and emit_
c
ontext
_
line
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
S
y
nc with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C
H
a
m
ano
G
i
t
2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'j
k
/
s
t
ill-inte
r
est
i
ng' into ma
i
n
t
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o
C
Ham
a
no
M
erge branch 'jc/hash-object' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
i
o
C Hamano
Mer
g
e branch 'jk/rebase-qu
i
et-noop' into
m
a
int
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Ha
m
ano
Merg
e
bran
c
h 'sg/comple
t
e
-
d
ecorate-full-not-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge b
r
anch 'jk/filter-
b
r
a
n
c
h-us
e
-of
-
sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Haman
o
Merge bra
n
ch 'jc/daemon-no-ipv6-for-2
.
4
.
1' into m
a
int
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Mer
g
e br
a
nch 'jk/st
a
sh-
r
equire-clean-in
d
ex' into main
t
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merge br
a
nch '
j
k/git-no-mo
r
e-
a
r
g
v0-path-munging'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C H
a
mano
Fifth batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
n
o
Merge branch 'nd/
u
ntracked-
c
ac
h
e
'
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Merg
e
branch 'rs/plug-leak-in-pack-bitmaps'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Me
r
ge
b
ranch 'pt/pull-ff-vs-merge-
f
f'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Merge branch 'pt/
p
u
ll-log-n'
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
M
erg
e
branch 'jk/rerere-forget-check-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Luke Diamand
git-p4:
tests: use test-chmtime in place of touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
t4015: se
p
a
rate comm
o
n
setu
p
and per-test expec
t
atio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C H
a
mano
t401
5
: mo
d
ernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
M
e
rge branc
h
'jk/ht
t
p-backend-deadloc
k
-
2
.
3' into
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
branch 'jk/http-backend-deadlock-2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff
Kin
g
http-backend:
s
pool r
e
f negotiation re
q
uests to
buff
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael
H
aggerty
s
truct ref_lock:
conv
e
rt old_
s
h
a
1
m
e
mb
e
r to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
wa
r
n
_
if_dangling_
s
ymref(): conver
t
local varia
b
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
each
_
re
f
_fn_adapte
r
(): remove ada
p
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael
Haggerty
rev_list_inser
t
_ref
(
)
:
remove unneeded arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
rev_l
i
st_inse
r
t_ref_oid():
new functio
n
, taking an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ae
l
Ha
g
g
erty
mark_c
o
m
p
lete(): remove unneeded arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggert
y
mark_comple
t
e_oid(): new func
t
ion, ta
k
ing
an
o
bje
c
t
_oid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
agg
e
rty
clea
r
_marks(): rewrite t
o
take an
ob
j
ec
t
_id argum
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
mark_comp
l
e
t
e(): rewrite to take an
o
bject_id
a
rgument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
se
n
d_ref(): co
n
vert
l
o
ca
l
varia
b
l
e
"
peeled"
t
o object_
i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
upload-pack: rewrite
f
unct
i
ons to tak
e
object_id arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Hagger
t
y
f
i
nd_s
y
m
ref(): con
v
ert
l
ocal variable
"
un
u
s
ed" to objec
t
_
id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
f
i
nd_symref(): rewrite t
o
take an object_id a
r
gument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ae
l
H
a
ggerty
write_on
e
_ref(): re
w
ri
t
e
to ta
k
e an object_i
d
a
r
gument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
write_refs_t
o
_temp_dir(): conver
t
local
v
a
ri
a
ble sha1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next