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 'jk/color-diff-plain-is-context'
2015-06-11
J
u
n
i
o C Ha
m
ano
M
erge b
r
anch 'j
k
/c
o
lo
r
-diff
-
pl
a
in-is-contex
t
'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio C
Haman
o
Merge b
r
anch 'jk/clo
n
e-d
i
s
s
ociate'
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io C
H
a
m
ano
Merge b
r
a
nch 'jc/diff-ws-error-highl
i
ght
'
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o
C
Hamano
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Git 2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
The first h
a
lf
o
f the seventh batch fo
r
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
n
o
Merge branch 'l
d
/
p4-ed
i
tor-multi-wor
d
s'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'bc/obje
c
t-id'
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge
bran
c
h 'jk/at-push-
s
h
a
1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'dl/branch-erro
r
-me
s
sage' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C H
a
mano
Merg
e
branch 'jk
/
s
k
i
p
-http-tests-unde
r
-
no-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge
branch
'
ps/doc-
p
ackfil
e
-vs-pack-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge bran
c
h 'fg/document-commit-m
e
ssage-s
t
ripp
i
ng
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge
branch 'jk/r
e
rere-forget
-
check
-
enabled' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
br
a
nch 'pt/pull-log-n' int
o
main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
an
c
h 'pt/pull-ff-vs-merge-ff'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
branc
h
'rs/plug-l
e
a
k-
i
n-pack-bitmaps'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch
'j
a
/
tutorial-asciidoctor-fix' into
m
ain
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hama
n
o
M
e
r
ge branch 'jk/stripspace-as
c
iidoc
t
or-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
un
i
o C Hama
n
o
Merge br
a
nch
'
jk/asciidoc-m
a
rkup-fix'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch
'
ps/bundle-v
e
rify-
a
rg' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'mh/write-
r
efs-sooner-2
.
4' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C H
a
mano
Merge
branch
'mh/re
f
-d
i
rect
o
ry-f
i
le' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch 'mg/log-d
e
corate
-
HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
M
erge
branch '
s
b
/
t10
2
0
-
cleanup' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e br
a
nc
h
'
j
c
/gitign
o
re-precedence' i
n
to main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ha
m
ano
Merg
e
branch 'bc/conn
e
c
t-p
l
ink' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge bran
c
h
'ph/rebase
-
i-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge
b
r
anch
'jk/add-
e
-
kill
-
editor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge branch 'mh/clone-ver
b
osity-fix' i
n
to main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'jk/sha1-
f
i
le-r
e
duc
e
-
useless
-
w
arnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
erge branch 'tb/blame-resurrect-
c
o
nvert-
t
o-g
i
t'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch 'jc/plug-
f
mt-merge-msg-leak' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch
'
pt/
x
dg-con
f
ig-path'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
Sixth batch 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 bran
c
h 'sb/test-bitmap-fre
e
-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C
H
ama
n
o
Merge
br
a
nch 'mm/re
b
ase-i-p
o
st-rewr
i
t
e-exec'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge branc
h
'
fm/fetch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merg
e
bran
c
h 'sg/help-g
r
oup'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branc
h
'
m
m/lo
g
-f
o
rmat-raw
-
d
o
c
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge branc
h
'dt
/
ca
t
-file-follo
w
-
s
ymlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
Me
r
ge
branch 'rs/ja
n
i
torial'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C
Hamano
Merg
e
branch '
j
k/st
a
sh-
o
ptions'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e
b
ranch 'da/me
r
getool
-
winmerge
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
M
e
r
g
e bra
n
ch 'mc/
c
ommit-doc-gram
m
o
fi
x
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge bra
n
ch 'jh
/
filter-empty-con
t
ents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Merg
e
branch 'ah/
u
sag
e
-strin
g
s'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge
branch 'jk/h
t
tp-backend-
d
eadlock'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
aman
o
Merge branch 'dt/c
l
ean-paths
p
ec-filter-th
e
n-lst
a
t'
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
Kin
g
diff
.
h: r
e
name
D
IFF_PLA
I
N color slo
t
t
o
DIFF
_
C
O
N
T
EXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff King
dif
f
:
a
cc
e
pt
color
.
d
i
ff
.
cont
e
xt as a synony
m
for "plain"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Ju
n
io
C Hamano
M
erge
branch
'
nd/untracked-
c
a
che'
commit
|
commitdiff
|
tree
2015-05-27
Jeff Kin
g
t70
6
3: hide stderr from setup inside prere
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f King
clo
n
e: r
e
order --dissoci
a
te
a
nd --re
f
erence options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
ing
clone: use
OPT_STRING_LIST for
-
-ref
e
rence
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C
Ham
a
no
dif
f
.
c: -
-
ws-er
r
or-h
i
ghlight=<kind>
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
d
i
f
f
.
c:
ad
d
emit_del_line() an
d
emit_c
o
ntext_line()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Syn
c
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
Junio C Hamano
Merge branch 'jk
/
still-interesting
'
i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
erge branch 'jc/hash-obje
c
t' into
ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Mer
g
e b
r
a
n
ch 'jk/rebase-quiet-no
o
p'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C Hama
n
o
Merge branch '
s
g/complete-decorate-fu
l
l
-
not-l
o
ng'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merge branch 'jk/filter-branch-use-of-se
d
-on-incomp
l
e
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merge branch 'jc/daemon-
n
o-ipv6-for-2
.
4
.
1' into maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merge branch '
j
k
/stash-requir
e
-clean-index' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
M
erge
b
ranch 'jk/git-no-more-argv0-path-m
u
n
g
ing'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
F
i
fth batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C
H
amano
Merge b
r
a
nch 'n
d
/
u
n
t
racke
d
-
c
ache'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
m
ano
Merg
e
bran
c
h
'
r
s
/plug-
l
eak-i
n
-pack-bitma
p
s'
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C
Hamano
M
e
rge bran
c
h
'
p
t
/
p
ull
-
ff-vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C
H
amano
M
e
rge
b
ranch 'p
t
/pu
l
l
-
log-n'
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C
Hamano
Merge bran
c
h 'jk/re
r
ere-f
o
rget-ch
e
ck-enable
d
'
commit
|
commitdiff
|
tree
2015-05-26
L
u
ke Diamand
git-p4: t
e
sts: use test-
c
hmtime
i
n pla
c
e of 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 an
d
per-t
e
st ex
p
ectation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C
H
am
a
no
t
4015: modernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Merge br
a
nch
'
j
k
/http-b
a
ckend-de
a
dlock-2
.
3' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Ha
m
ano
Merge br
a
n
c
h 'jk/http-
b
acken
d
-
de
a
dlo
c
k-2
.
2
' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
eff K
i
ng
http-b
a
cken
d
:
spool ref negotia
t
ion reque
s
ts to buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Ha
g
gerty
struct re
f
_l
o
c
k: co
n
vert old_sh
a
1 member
t
o ob
j
ect_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael
H
agg
e
rty
w
a
r
n
_
if_dang
l
ing_symref(): convert local var
i
able
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Ha
g
gerty
each_ref_fn_ada
p
te
r
(): remove a
d
ap
t
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Ha
g
gerty
rev
_
list_in
s
ert_ref
(
)
:
r
emove un
n
eeded
arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
rev_list_insert
_
ref_oid(): new fu
n
ctio
n
, takin
g
an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael H
a
ggerty
ma
r
k_compl
e
te
(
): r
e
move unneeded
a
rgume
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Haggerty
mark
_
co
m
plete_oid
(
)
: new
f
unction, tak
i
ng a
n
object_oid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
h
ael
H
aggerty
clear
_
marks():
r
ew
r
ite to
take an object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
mark_comp
l
ete():
r
e
w
rite to take
an object_id argume
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
send_ref(): con
v
ert local variable "peeled
"
to object
_
i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael
H
aggerty
upload-pa
c
k
:
rewri
t
e func
t
ions
t
o ta
k
e
o
bjec
t
_id arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
find_
s
ymre
f
(
): co
n
vert local var
i
able "un
u
sed" to o
b
j
e
c
t
_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
fi
n
d_symref():
rewr
i
te to
take an object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
write_on
e
_re
f
()
:
re
w
rite to t
a
ke an object_id
arg
u
me
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
H
a
ggerty
write_refs
_
to_temp_dir(): co
n
vert l
o
ca
l
variable s
h
a
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Ha
g
gerty
submodule
:
rewrite to take an object_id argum
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Hagge
r
ty
shallow: rewrite functions to take object_
i
d
a
rguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael
Haggerty
ha
n
dle_one_ref(): rewrite to take
a
n object_id
argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
add_inf
o
_ref()
:
r
e
write to ta
k
e an object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Hagge
r
ty
handle
_
one_reflog(): rewrite to take an o
b
ject_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
regist
e
r
_replace
_
r
ef(): rewrite to take an obj
e
ct_id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next