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
Ju
n
io C Hamano
Merge
b
ranch 'jk/color-
d
iff-plain-is-context
'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Me
r
ge bra
n
ch 'jk/clone-di
s
sociate
'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge
b
ranc
h
'jc/diff-ws-error-h
i
ghli
g
ht'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
S
yn
c
with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
a
mano
G
i
t 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
The first half of the seventh batch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
J
uni
o
C
Hamano
Me
r
g
e
bran
c
h 'ld/p4-
e
ditor-multi-
w
o
r
ds'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch '
b
c/object-i
d
'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Merge branch 'jk/at
-
push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'dl/br
a
n
c
h-error-message' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Mer
g
e branch
'
jk/s
k
ip
-
http-tests
-
under-no-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch 'ps/doc-pa
c
k
file
-
vs
-
pack-file'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch 'fg/docu
m
ent
-
commit-message-s
t
r
ipp
i
ng
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merg
e
br
a
n
ch
'
j
k
/r
e
rere-fo
r
get
-
check-
e
nable
d
' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch 'pt/pull-log-n'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C
H
amano
M
erge
b
ranch 'pt/pull-ff-vs-merge
-
ff' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'rs/plug-leak-i
n
-pack
-
bitma
p
s' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Ha
m
a
n
o
M
e
r
g
e branch 'j
a
/tu
t
orial-as
c
iidoctor-fi
x
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branc
h
'jk/st
r
ipsp
a
ce-a
s
ciidoctor-fix'
in
t
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch 'jk/ascii
d
o
c-
m
arkup-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'ps/bundle-ver
i
fy-arg' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch 'mh/write-ref
s
-so
o
n
e
r
-
2
.
4' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Me
r
ge branch 'mh/r
e
f-di
r
e
c
t
ory-file' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
ma
n
o
Merge
branch 'mg/log-decora
t
e-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C H
a
mano
Mer
g
e branch
'
sb/t1020
-
cleanup'
i
nt
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C H
a
mano
M
e
r
g
e bra
n
ch '
j
c/gitigno
r
e-prec
e
de
n
ce' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Merge branch
'bc/connect-plink' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch 'ph/rebas
e
-i-r
e
do'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch 'jk/add-
e
-kill-editor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
M
e
rg
e
branch 'mh/clone-
v
er
b
osity-fi
x
'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rg
e
branch 'jk/sha1
-
f
ile
-
r
ed
u
ce-useless-
w
arning
s
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
n
c
h 'tb/b
l
ame
-
r
esur
r
ect-conve
r
t-t
o
-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ham
a
n
o
Merge branc
h
'jc
/
plug-fmt-m
e
rge-msg-l
e
ak
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge
branch
'
pt/xdg-config-path' int
o
maint
commit
|
commitdiff
|
tree
2015-06-01
Junio 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
Jun
i
o C Hamano
Mer
g
e branc
h
'sb/t
e
st-bit
m
ap-free-at
-
end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
Merge branch 'mm/rebase-i-post-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch 'fm/fetch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
ge branch
'
sg/
h
elp-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e
b
ranc
h
'mm/l
o
g-
f
ormat-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
erge b
r
anch 'dt/cat-file-fol
l
ow
-
sy
m
lin
k
s'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C H
a
mano
M
e
rge branch 'rs/ja
n
itori
a
l
'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio
C Hamano
M
er
g
e
bra
n
ch 'jk/stash-opt
i
ons'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
Merg
e
bran
c
h 'd
a
/mer
g
e
t
o
ol-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
M
e
rge branch 'mc/c
o
mmit-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'jh/filter-
e
mpty
-
con
t
e
n
ts'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Haman
o
Merge branch 'ah/usage-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Ham
a
no
Merg
e
branch 'jk
/
http
-
backend-dead
l
oc
k
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Me
r
ge branch 'd
t
/
clean-pathspec-filt
e
r-then-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
Ki
n
g
d
i
f
f
.
h
:
ren
a
me DIF
F
_PLAIN color slot to D
I
FF_CO
N
TEXT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
d
i
ff:
a
cce
p
t color
.
diff
.
context
a
s a syno
n
y
m for "plain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
uni
o
C
Hamano
Mer
g
e branch 'n
d
/
u
ntracked-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7063: hide std
e
r
r
fro
m
setup ins
i
de prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
c
l
o
ne: re
o
r
der --dissociate
a
nd --reference op
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f Ki
n
g
clone
:
use OPT_STR
I
NG_LIST for
-
-
r
eference
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C
Hamano
diff
.
c: --ws-error-hig
h
li
g
ht=<
k
ind
>
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jun
i
o
C
Hamano
diff
.
c:
a
dd emit_del
_
li
n
e
() and e
m
it_
c
ontext_line()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Git 2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge
b
r
anch 'jk/still-interes
t
ing'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Me
r
g
e
branch 'jc/hash-object' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
Merge branch 'jk
/
rebase-qu
i
et-no
o
p' into m
a
int
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
m
a
n
o
M
e
rge branch 'sg/complete-decorate-full
-
not-
l
o
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio
C
Haman
o
M
erge b
r
anch 'jk/filter-bra
n
ch-use-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
branch 'jc/daemon-no
-
ipv6-for-2
.
4
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io
C
Hamano
M
erge branch '
j
k/st
a
sh-require-clean-index' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o C
H
aman
o
Merg
e
branch 'jk/git-no-more
-
a
rgv0-path-mungi
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Fifth bat
c
h for
2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
er
g
e br
a
nch
'nd/
u
ntracked-cache'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Me
r
ge
branch
'
rs
/
plug-leak
-
in
-
pack-bitma
p
s'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
Merge bra
n
ch 'pt/pu
l
l-
f
f-vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hama
n
o
Merge br
a
nch 'pt/pul
l
-log-n'
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Merge br
a
n
c
h
'jk/rerere
-
fo
r
get-
c
he
c
k-enabled'
commit
|
commitdiff
|
tree
2015-05-26
L
u
ke Dia
m
a
nd
git-p4: t
e
sts: u
s
e test-c
h
mtime in pl
a
ce of touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C H
a
m
a
n
o
t4015: separa
t
e c
o
mmo
n
setup and p
e
r-test expectati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
t4015: moderni
s
e style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
r
g
e
b
ranc
h
'jk/http-ba
c
k
end-deadlock-2
.
3' in
t
o
jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk/h
t
tp-back
e
nd-deadlock-2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff Kin
g
http-backend: spo
o
l ref neg
o
tiation re
q
uests to buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
a
g
gerty
str
u
c
t ref_lock:
convert old_s
h
a1 memb
e
r to obje
c
t
_
id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Hag
g
erty
war
n
_if_da
n
gling_
s
y
m
ref(): con
v
ert loca
l
v
ar
i
able
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
H
aggerty
each_ref
_
fn_adap
t
er():
re
m
o
v
e adapte
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
rev_list_insert_r
e
f():
rem
o
ve unneeded argument
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
e
l
Hagger
t
y
rev_list
_
insert_ref_oid(): ne
w
fu
n
ctio
n
, taki
n
g
an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ae
l
Ha
g
ger
t
y
mark_complete(
)
: r
e
m
ove unneeded argu
m
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
H
a
gg
e
rty
mark
_
complete_o
i
d(): n
e
w
fu
n
c
tion, taking an object_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
clear_marks(): rewrite to take an object_id argu
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
m
a
rk_comple
t
e(): rewrite
t
o ta
k
e an object
_
id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Ha
g
gerty
s
e
nd_
r
ef(
)
: convert local var
i
abl
e
"p
e
ele
d
" to
object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
er
t
y
upload-pack:
r
ew
r
ite functions to
take object_id ar
g
um
e
n
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
find_symre
f
(): conv
e
r
t
loc
a
l vari
a
ble "unuse
d
" to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
cha
e
l Haggerty
find
_
sym
r
ef()
:
rewri
t
e to
t
a
k
e an obje
c
t_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael
Haggerty
wr
i
te_one_re
f
(): rew
r
i
te
t
o take an
o
bject_id argum
e
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
write_
r
efs_to_temp_dir():
conve
r
t local variable sha1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
submodule: rew
r
ite to t
a
ke an object_id argum
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
a
g
g
e
rty
shallow:
rew
r
ite
f
unctio
n
s to take obje
c
t_i
d
argum
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
han
d
le_one
_
ref(): rewr
i
te to ta
k
e an object_id arg
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
h
a
el
Hagg
e
r
t
y
add_in
f
o_ref():
rewrite to take an object_
i
d argume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
erty
handle_on
e
_re
f
log(): rewri
t
e to take
an object_id
a
rgum
e
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
r
e
g
ister_rep
l
ac
e
_ref(): re
w
rite to tak
e
an
o
bjec
t
_id
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next