repo.or.cz
/
git
/
mjg.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 Ha
m
ano
Merge branch
'
m
h/verify-lock
-
erro
r
-re
p
ort'
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C Ha
m
ano
Merge br
a
nc
h
'jk/co
l
or-dif
f
-plain-is
-
context'
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C Hamano
Merge
br
a
nch 'j
k
/clone-dissociat
e
'
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C Hamano
M
erge bra
n
ch 'jc/di
f
f-ws-error-hig
h
light'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Sy
n
c with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Gi
t
2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
T
h
e
first h
a
lf of the seventh batch for
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
amano
Merge branch '
l
d/p4-e
d
i
t
or-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
amano
Merge branch 'bc/obje
c
t-
i
d'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'jk
/
a
t-pu
s
h-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
aman
o
M
e
r
ge b
r
anch 'dl/br
a
nch-e
r
ror-message'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch '
j
k/ski
p
-
http-tests-under-
n
o
-
curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
ps/doc-p
a
ckf
i
le
-
vs-pack-file' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hama
n
o
Merge b
r
anch 'fg/d
o
c
ument-commit-me
s
s
a
ge-stripp
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge bra
n
ch 'j
k
/rerere-forget
-
check-enabled' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge branch 'pt/
p
ull-l
o
g-n' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hama
n
o
Merge
branch
'
pt/p
u
ll-ff-vs-me
r
ge-ff' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
uni
o
C Hamano
M
e
rg
e
branch 'rs/plu
g
-le
a
k-in-pack-bitmaps'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch 'ja/tutor
i
al-as
c
ii
d
oc
t
o
r
-f
i
x'
i
n
to
main
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch 'jk/s
t
ripspace-asciidoctor-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch
'jk/asciidoc-markup-fix'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Haman
o
M
erge branch
'
ps/bundle-verify-arg' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Haman
o
Merge
bra
n
ch
'mh/write-refs-so
o
n
er-2
.
4'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge branch 'mh/ref-directory
-
file
'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C Ham
a
no
Merge branch 'mg
/
log
-
decorate-HEAD' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
sb/t1020-cleanup' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Me
r
g
e
br
a
nch 'jc/gitig
n
ore-p
r
ecedence' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
M
e
rge branch
'bc/c
o
nne
c
t-plink' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o
C Ha
m
a
n
o
Merge
branch 'ph/rebase-
i
-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'j
k
/add-e-kill-editor' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e branc
h
'mh/clone-verbos
i
ty-fix'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch '
j
k/sha1-file-reduce
-
useless-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Mer
g
e branch
'
tb/bla
m
e-r
e
surrect-co
n
vert-to
-
gi
t
' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Ham
a
no
M
e
r
g
e branch 'jc/plu
g
-
fmt-merge-msg
-
leak' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'pt/xdg-config-
p
ath' into main
t
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Sixth bat
c
h
for
2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'sb/test-bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge branch 'mm/rebase-i-post-rewr
i
te-exec'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Merge bran
c
h 'fm/
f
etch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge b
r
anch
'
sg/help-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch 'mm
/
lo
g
-format-ra
w
-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge b
r
anch 'd
t
/cat-file-follow-
s
ym
l
inks'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
a
m
a
n
o
Merge
b
ra
n
ch
'
rs/j
a
nitori
a
l'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Merge branch 'jk/stas
h
-opt
i
ons'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
M
e
r
ge
b
ranch 'da/mergetool-w
i
nm
e
rge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'mc/c
o
mmit-doc-gram
m
ofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
Merge branch 'jh/filter-
e
mpty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
Merge branch 'ah/usage-
s
trin
g
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
amano
Merge
b
ran
c
h 'j
k
/http-backend-
d
eadl
o
ck'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hama
n
o
Merge branch
'
dt/cl
e
an-pathspec-filter-the
n
-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Micha
e
l
Ha
g
gerty
ref_
t
ransactio
n
_commit():
d
o
not capit
a
lize
e
rror
m
essages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Micha
e
l
Haggert
y
verify_lo
c
k()
:
do no
t
capit
a
liz
e
error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
verify_lock(): report e
r
r
ors v
i
a
a s
t
rbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f K
i
n
g
d
iff
.
h: rename DI
F
F_PLAIN c
o
lo
r
slot to
D
IFF_CONTEXT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff: a
c
c
e
pt co
l
or
.
di
f
f
.
cont
e
xt as a
sy
n
o
nym
f
o
r "plain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
Merge b
r
anch 'nd/untrack
e
d-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff K
i
ng
t7063: hide stder
r
from set
u
p i
n
side
prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
veri
f
y_
l
ock(
)
: o
n
errors, let the caller unlock the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
i
chael Haggerty
v
erify_lock
(
): return 0/-1 rather
t
han
str
u
ct ref_lock *
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff K
i
ng
clone: reorder --d
i
ssociate and
-
-re
f
erence options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff King
c
lon
e
: use
O
PT_STRING_LIST for
-
-
reference
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
d
i
ff
.
c: --ws-e
r
ror-hig
h
l
ight=<kind> option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C Ha
m
ano
d
iff
.
c: add
e
mit
_
del_line() and
em
i
t_co
n
text_lin
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
S
y
nc with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Git 2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Merge
branch 'jk/
s
till-inter
e
sting' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merg
e
branch 'jc/h
a
sh-object'
int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e branch '
j
k/rebase-quiet
-
noop' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
br
a
nch 'sg/complete-dec
o
rate-full
-
not
-
long' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
M
erge branch 'jk/filter-
b
ranch-use-of-
s
e
d-on-incomp
l
ete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
Merge br
a
nch 'jc/da
e
mon-
n
o-ipv6-for
-
2
.
4
.
1' into maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
M
e
rge
b
ranc
h
'jk/stash-require-clean-index' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge branc
h
'jk/git-no-m
o
re-argv0
-
path-munging' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio
C
H
amano
Fift
h
ba
t
c
h for
2
.
5 cy
c
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C H
a
mano
Merge
b
r
a
nch 'nd/untra
c
ked-c
a
che'
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
M
erge b
r
anch 'rs/pl
u
g-lea
k
-in-
p
ack
-
bitmaps'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
Mer
g
e b
r
a
n
c
h '
p
t/pull
-
f
f
-vs-merge-f
f
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
r
ge branch 'pt/pull-log-
n
'
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hama
n
o
Merg
e
branch
'jk/rerere-forget-check-
e
nabled
'
commit
|
commitdiff
|
tree
2015-05-26
Luke Diama
n
d
g
it-p4: tests: use test
-
chmt
i
me in place of
t
ouch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
t
4015: separate comm
o
n setup an
d
per-test expe
c
tat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
t401
5
:
mode
r
nise style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Merge b
r
an
c
h 'j
k
/http-b
a
ckend-deadlo
c
k-
2
.
3' i
n
to jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
M
e
rge branch 'jk/ht
t
p-backend-deadlock
-
2
.
2' in
t
o jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
h
t
t
p
-
b
a
ckend:
s
pool r
e
f negoti
a
t
i
on requests to buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
struct ref_lock: convert old_sha
1
membe
r
t
o
o
bj
e
ct_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Hagg
e
rty
w
a
rn_if_dangli
n
g_symref
(
): conver
t
local
variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
c
h
ael Haggerty
each
_
ref_f
n
_adapter(): rem
o
ve adapter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
rev_lis
t
_insert_ref(): remove unn
e
ede
d
arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael
H
agger
t
y
rev_list_ins
e
r
t_ref_oid(
)
:
n
ew fu
n
ction, taking an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael
Haggerty
mark_compl
e
t
e
(
):
remove u
n
need
e
d argume
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
m
ark_c
o
mplete_oid():
n
ew function
,
taking an
object_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Hagge
r
ty
cl
e
a
r
_ma
r
ks(): rewr
i
te to take an obj
e
ct_id argu
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Ha
g
g
e
r
t
y
mark_complete():
r
ewrite 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
Haggerty
send_
r
ef(): conve
r
t local
v
ar
i
able "peel
e
d"
t
o object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
u
p
load
-
pack
:
rewrite functi
o
ns
t
o take object_id arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
find_symref(): c
o
nver
t
local
variable "unused" to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
f
i
nd_sym
r
e
f(
)
:
r
ewrite
t
o take an objec
t
_id argu
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
write_one_ref(): re
w
rite
to
tak
e
an object_id a
r
g
ument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ic
h
ael Haggert
y
wr
i
te_refs_
t
o_te
m
p_
d
ir()
:
convert loc
a
l
v
a
riab
l
e sha1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next