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 'jk/color-diff-plain-is-context'
2015-06-11
Junio C Hamano
M
e
rge br
a
n
ch
'
jk/col
o
r-diff-plain-is-conte
x
t
'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
M
erge bran
c
h 'jk
/
clo
n
e-dissociate'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
H
am
a
no
Merge bra
n
ch 'jc/dif
f
-ws
-
e
rr
o
r
-highlight'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Sync wit
h
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
G
it 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
The
f
ir
s
t half of
the seventh
b
a
tch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch
'
ld/p4-ed
i
tor-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
Hamano
Me
r
ge branch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bra
n
ch 'jk/at
-
push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge bra
n
ch 'dl/bra
n
ch-er
r
or-me
s
sage' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C H
a
mano
M
erge br
a
nc
h
'
j
k/skip-
h
ttp-
t
ests-
u
n
der-no
-
cu
r
l' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
M
e
rge branch '
p
s/doc-
p
ackfile-vs-pac
k
-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C
Hamano
Merge
bran
c
h 'f
g
/
d
o
cument-commit
-
message-s
t
rip
p
ing
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
M
e
rge branch 'jk/re
r
ere-f
o
r
ge
t
-check-enabled'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge
bra
n
ch 'pt/pull-log-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ra
n
ch 'pt/pull-
f
f-vs-mer
g
e
-
ff'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge
branch 'rs/plug-leak-
i
n
-pack-b
i
t
m
aps'
into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge bran
c
h 'ja/tutorial-as
c
ii
d
oc
t
or-fix' int
o
main
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C Hamano
Merge branch 'jk/stripspa
c
e-asciidoct
o
r-
f
ix' i
n
to
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
M
e
rge
b
ranch 'jk/asciidoc-markup-fix' in
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch 'ps/
b
undle-v
e
r
ify
-
a
r
g
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C H
a
m
a
no
Merge branch
'mh/
w
ri
t
e-re
f
s-sooner-2
.
4'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hama
n
o
Merge bra
n
c
h
'mh/ref-
d
irector
y
-file' into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'mg/log-decorate-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C H
a
mano
M
e
rge bran
c
h
'
sb/t1
0
20
-
cle
a
n
u
p' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge bran
c
h 'jc/gitign
o
re-preceden
c
e
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branc
h
'bc/co
n
nect-plink'
into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o
C Hamano
Me
r
ge
b
ranch '
p
h/
r
ebase-i-redo'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge
b
ranch 'jk
/
add-e-kill-editor' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ha
m
ano
Merge
branch 'mh/c
l
one-verbosit
y
-
f
ix' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
Hamano
M
e
rge
branch 'jk/s
h
a
1-file-reduce-useles
s
-w
a
rnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Me
r
ge
bra
n
ch 'tb/blame-resurre
c
t
-
convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Merge branch 'jc/plug-f
m
t-mer
g
e-msg-le
a
k' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Mer
g
e
b
ranch 'pt
/
xdg-co
n
fi
g
-path' into m
a
int
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Si
x
th b
a
t
ch for
2
.
5
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merg
e
b
r
anch 'sb/test-
b
i
tmap-free-at-e
n
d'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Merg
e
branch 'mm/rebas
e
-i-post
-
re
w
rite-exec'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
Merge branch 'f
m
/
fetch
-
ra
w
-sha1'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io C Hamano
M
e
rg
e
branch 'sg/help-group'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C
H
a
ma
n
o
Merge
b
r
a
nch 'mm/log-
f
ormat-raw
-
doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge bra
n
c
h
'dt/cat-f
i
le-follow-sym
l
inks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Ha
m
ano
Merg
e
br
a
n
c
h
'rs/janitorial
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge bran
c
h 'j
k
/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e branch '
d
a/mergetool-
w
i
n
merge'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge
bran
c
h 'mc/co
m
mit-doc-gr
a
mmofix
'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C
Hamano
Merge branch 'jh/fil
t
er-em
p
t
y-contents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merg
e
b
r
an
c
h 'ah/usage-strings'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o
C
Ha
m
ano
Merge branch 'jk/http-backen
d
-d
e
adlock'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o C Hamano
Me
r
ge branch 'dt/clea
n
-pathspec-fi
l
te
r
-then-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff
.
h
: rename DIFF_PLA
I
N
c
o
l
o
r slo
t
to D
I
FF_CONTE
X
T
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff King
diff:
a
ccept co
l
o
r
.
diff
.
context
a
s a synony
m
for "plain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Ju
n
io C
H
a
mano
M
e
rge branch 'nd/un
t
racked-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7063: hide st
d
err
f
rom se
t
up
i
nside prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
in
g
c
l
one
:
reorder --d
i
sso
c
iate an
d
--reference options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
i
ng
clone:
u
se OPT_
S
TRING_LIST for -
-
ref
e
rence
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
diff
.
c
:
-
-
w
s
-error-highlight=
<
kind
>
op
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Ham
a
no
diff
.
c: add em
i
t_del_line(
)
and
e
mit_contex
t
_l
i
ne()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Sync wi
t
h 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C
H
amano
G
i
t 2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
n
o
Merge branch 'j
k
/still-interesting
'
into
m
aint
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C
H
am
a
no
Merge branc
h
'jc/hash-ob
j
ect' into
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io
C Haman
o
Me
r
ge branc
h
'jk/rebase-quiet-noop
'
into
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branc
h
'sg
/
compl
e
te-d
e
corate-full-not-
l
ong'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merg
e
branch 'jk/
f
ilter-branch-u
s
e-of
-
sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Me
r
ge branch 'jc/daem
o
n
-
no-
i
pv6-fo
r
-2
.
4
.
1' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Mer
g
e
b
ranch
'
jk/stash-re
q
uire-
c
lean-index
'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
J
unio
C
Hamano
Merge br
a
nch 'j
k
/
git-no-m
o
re-argv0
-
p
ath-munging'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Haman
o
Fifth ba
t
ch f
o
r 2
.
5
c
ycl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Me
r
ge branch 'nd
/
untracked-cache'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Merge
b
ranch 'rs/p
l
ug-leak
-
in-
p
ack-
b
itmaps
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Haman
o
Merg
e
branc
h
'pt/pull-ff-vs
-
m
erge-ff
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
r
g
e
b
ra
n
ch 'pt/pu
l
l
-log-n'
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Ham
a
no
Merge br
a
nch 'jk/rerer
e
-fo
r
ge
t
-check-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Luke Dia
m
and
git-p4
:
tests: us
e
te
s
t
-
c
h
mtime
i
n pla
c
e of t
o
uc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
t4015: sep
a
rate
common se
t
up and per-test exp
e
c
tation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
t401
5
: modernis
e
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Ham
a
no
Merge branch 'jk
/
http
-
ba
c
kend-deadlock-2
.
3' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Merge
b
ra
n
ch 'jk/http-
b
ackend-
d
eadlock-
2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Je
f
f K
i
ng
h
ttp-ba
c
ken
d
: spoo
l
ref
n
egotiation req
u
ests
to buffe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
e
l Haggerty
s
t
r
uc
t
ref_lock:
c
onver
t
old_sha1
m
em
b
er to ob
j
ect_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hag
g
erty
w
a
rn_
i
f_dangling_symref()
:
convert local variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
each_re
f
_f
n
_adapt
e
r
():
r
emove adapter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
r
ev
_
list
_
insert_
r
ef
(
): r
e
mo
v
e unnee
d
e
d arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
re
v
_list_insert_ref_oid(): new function, taking an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Haggerty
mark
_
complete(): remove unneed
e
d arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
mark_complete_oid(
)
: new fun
c
tio
n
,
ta
k
ing
an object_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
c
hael Haggerty
clear_marks
(
): r
e
w
rite to take an object_id ar
g
umen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael
H
a
g
gerty
mark_comp
l
et
e
(
)
:
rew
r
ite to
t
ak
e
an o
b
ject_id arg
u
m
e
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
s
end_ref(): conver
t
l
o
ca
l
v
ariabl
e
"peel
e
d"
t
o obje
c
t_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ich
a
el Haggerty
up
l
oad-pack:
r
ewri
t
e functions to take object_id arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
find_
s
ymref(
)
: convert local variabl
e
"unused" to obj
e
ct_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
find_s
y
mref(): rewrit
e
to take an object_id argume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Hagg
e
rty
write_one_ref(): rewrite t
o
take
an ob
j
ect_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Hagg
e
r
t
y
write_refs_t
o
_temp_dir(): convert local variable
sha1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
submod
u
le: rewrite
to take an
object_id ar
g
ument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael
H
aggerty
s
hallow: rewrite function
s
to take object_i
d
arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
handle_one_r
e
f(): rewrit
e
to
t
a
ke an
o
bject_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hag
g
erty
add_info_ref(): rewrite
t
o take an
object_id
a
rgument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
e
rty
handle_one_refl
o
g(): re
w
rite t
o
tak
e
a
n
object_id a
r
g
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Hagge
r
t
y
register_replace_ref()
:
rewri
t
e
to take an object_id
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next