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
J
unio C
H
amano
M
erge
bran
c
h 'mh
/
v
erify-lock
-
er
r
or-rep
o
rt'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
M
erge br
a
nch 'jk/
c
olor-d
i
ff
-
pl
a
in-is-context'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch
'jk/clon
e
-di
s
sociate'
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C Hama
n
o
Merge bran
c
h
'
jc/diff-ws-err
o
r-highligh
t
'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Sync
w
i
th 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
Ha
m
an
o
The first half of the se
v
enth batch fo
r
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'ld/p4-
e
ditor-multi
-
words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merge branch 'bc
/
object-id'
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Merge branch 'jk/at
-
push
-
sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'dl/branch-error-
m
ess
a
ge' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge branch 'jk/ski
p
-http-t
e
s
t
s
-
unde
r
-no-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'p
s
/doc
-
p
ack
f
i
l
e-vs-pa
c
k-file' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e branch 'fg/do
c
ument-co
m
m
i
t
-message-s
t
r
i
p
ping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C H
a
mano
Merg
e
br
a
nch
'
j
k/rerer
e
-
f
orget-check-
e
na
b
led' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge
b
ranch 'pt/
p
ull-log-n' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge b
r
a
nch '
p
t
/pul
l
-ff-vs-me
r
g
e-ff' i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'rs/
p
lug-leak-in-p
a
ck-bitmaps' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge
bran
c
h 'j
a
/tutorial-
a
sciidoc
t
or
-
fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge b
r
anch 'jk/stripspace-a
s
ciido
c
t
o
r-fix
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C Ha
m
ano
M
e
rge branch 'jk/asciido
c
-mark
u
p-fix' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge br
a
nch 'ps/bu
n
dle-verify-arg' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge b
r
anch 'mh
/
write
-
refs-soone
r
-
2
.
4' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
H
a
man
o
Merge
b
ra
n
ch 'm
h
/ref-directory-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
H
ama
n
o
Merge
branch 'mg/log-deco
r
ate-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hama
n
o
Merge branch
'
s
b/t1020-c
l
eanup' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merg
e
bra
n
ch '
j
c/gitignore-
p
receden
c
e
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
M
e
r
ge bra
n
ch 'bc/
c
on
n
e
c
t-
p
l
i
nk' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
Hamano
Merge branch 'ph/
r
ebase-i-r
e
do' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge bran
c
h 'jk
/
add
-
e-kill-edi
t
o
r
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
branch 'mh
/
clon
e
-verbosit
y
-
fix
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge br
a
nch
'
jk/s
h
a1-file
-
reduc
e
-u
s
e
less-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge br
a
nc
h
'tb/blame-res
u
rrect-co
n
vert-t
o
-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Ham
a
no
Mer
g
e branch 'jc
/
plug-fmt-merge-m
s
g-
l
ea
k
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h
'
p
t/xdg-confi
g
-path
'
in
t
o main
t
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
S
ixth bat
c
h for
2
.
5 c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
unio C
H
amano
Merge branch 'sb/test
-
b
itm
a
p
-
f
ree-at-en
d
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'mm/reba
s
e-i-
p
ost-rew
r
ite-e
x
e
c
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge branch 'fm/fet
c
h-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'sg/help-gro
u
p'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
Merge branch 'mm/lo
g
-format-r
a
w
-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Merge br
a
nch 'dt/cat-f
i
le-
f
o
l
low-s
y
mlinks'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
M
e
rge branch
'
rs/j
a
ni
t
orial'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
Merge
b
ranch 'jk/stash-o
p
tio
n
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Ha
m
ano
Merge branch 'd
a
/mergeto
o
l-w
i
nmer
g
e
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Ha
m
ano
Merge b
r
a
nch 'mc/com
m
it-doc-g
r
am
m
ofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge br
a
nch 'jh/filter-empty-cont
e
nts'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge b
r
anch 'ah/usage-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e branch 'j
k
/
h
ttp
-
backend-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
ge branch 'dt/clean-paths
p
ec
-
filte
r
-then-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Michael Ha
g
gerty
ref_transaction_
c
o
mmit(): do no
t
capitali
z
e error
m
e
ssages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
i
c
hael Hagg
e
rty
ve
r
ify_l
o
ck():
d
o n
o
t capitalize error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael
H
a
ggerty
verify_
l
ock(): repo
r
t
errors via a strbu
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff Kin
g
di
f
f
.
h: rename DIFF_PLAIN color slot t
o
D
I
FF_CONTEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff: ac
c
e
pt color
.
diff
.
context as
a
synonym for "pl
a
in
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
M
e
rge
b
r
anch 'nd/untracked-cache
'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7063: hide st
d
err
f
r
om
s
e
tup in
s
ide prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
ichael
Haggerty
veri
f
y_lock(): on errors, let the cal
l
e
r
unlock th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
ichael Hagg
e
rty
v
e
rify_lock(): r
e
turn 0/-1 rathe
r
than struct ref_lock *
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone: reo
r
d
er --
d
issoc
i
a
t
e a
n
d -
-
reference optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff King
cl
o
ne: us
e
OPT_
S
TR
I
NG_
L
I
ST fo
r
--refere
n
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C Hamano
diff
.
c: --ws-erro
r
-
h
ig
h
ligh
t
=<
k
ind> option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
diff
.
c
:
add e
m
it_del_line()
and emi
t
_
c
o
ntext
_
line()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Sync 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
Junio C Hama
n
o
Merge branch 'jk/still-interesting' into main
t
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C
H
a
mano
Me
r
ge branch 'jc
/
h
ash-obj
e
ct' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
Merge bran
c
h 'jk/rebase
-
quiet-noop' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Merge branch 'sg/comp
l
ete-deco
r
ate-f
u
ll-not-l
o
ng' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hamano
Mer
g
e branch 'jk/filt
e
r-bra
n
ch-u
s
e-of-sed-on
-
inco
m
plete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Haman
o
Merge branch 'jc/dae
m
on-
n
o-
i
pv6-for
-
2
.
4
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
M
e
r
g
e branch
'
jk/stash-require-cl
e
an-index' in
t
o
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e branch 'jk/git-no
-
more-argv0-path-munging'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Fifth ba
t
c
h for
2
.
5
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e branch '
n
d/untracked-cache'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
Merg
e
branch
'rs/plug
-
l
eak-in-pack-
b
itmaps'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
b
r
an
c
h 'pt/pull-
f
f-vs-merg
e
-
f
f
'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C
Hama
n
o
Merge bran
c
h
'pt/pull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
Merg
e
b
r
a
nch 'jk/rerere-forget-check-enab
l
e
d'
commit
|
commitdiff
|
tree
2015-05-26
Lu
k
e
Diamand
g
i
t-
p
4: tests: use test-chmtime in place
o
f touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
t4015: sep
a
rate common
setup and per-test expec
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
t401
5
: modernise sty
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
M
erg
e
branch
'
j
k
/http-
b
ack
e
nd-deadlock-2
.
3
'
into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Haman
o
Merge branch
'
jk/http-ba
c
kend-deadlo
c
k-2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
http-backend:
sp
o
ol ref negotiation
requests to buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
s
t
ruc
t
ref_lock:
convert old_
s
ha1 member to ob
j
e
c
t_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
war
n
_if
_
dangling
_
s
ymref(): convert local
v
ariable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Hag
g
erty
e
ach_r
e
f_fn_adapter(): remove adapter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
rev_list_insert_ref():
r
emove unn
e
eded a
r
gume
n
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
rev_list_ins
e
rt_ref_oid():
n
ew fu
n
cti
o
n, taki
n
g an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
m
ark_complete():
remove
u
nneeded a
r
gum
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
mark
_
complete_oid(): new function, takin
g
a
n
o
bject_
o
id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
clear_mark
s
(
)
: rewrite to take an
object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
m
a
rk_comp
l
ete():
rewrite to
ta
k
e an obje
c
t_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael
Haggerty
send_re
f
(): c
o
nv
e
rt l
o
c
a
l v
a
riable
"pee
l
ed" to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el H
a
gger
t
y
u
p
load-pack: rewrite funct
i
ons
t
o t
a
ke obje
c
t_id arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael
Haggerty
find_symref()
:
conv
e
rt
l
ocal va
r
ia
b
le
"
unused" to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
find_s
y
mref(): rewrite to take an object_id argumen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hagger
t
y
wri
t
e_one_ref(): rewrite to
take a
n
objec
t
_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
cha
e
l
H
aggerty
write_
r
e
fs_to_temp_dir(): conve
r
t local variab
l
e sha1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next