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 'mt/p4-depotFile-at-version'
2015-06-11
J
u
nio C Hamano
Merge branch 'mt/p4-depotFile-at
-
version'
commit
|
commitdiff
|
tree
2015-06-11
J
unio C Ha
m
a
n
o
M
e
r
g
e
branc
h
'mh/verify-l
o
ck-error-r
e
port'
commit
|
commitdiff
|
tree
2015-06-11
J
unio C
H
ama
n
o
Me
r
ge br
a
nch
'
jk/col
o
r-diff-p
l
a
i
n-
i
s-context'
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
i
o
C
H
amano
Mer
g
e branch 'jk/clone-di
s
so
c
iate'
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C Ham
a
no
Merge branch
'
jc/diff-ws-e
r
ror-highlight'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Sync
with 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 Hamano
The
fir
s
t
half of the seventh batch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge branc
h
'ld/p4-
e
d
i
tor-multi-word
s
'
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge
branc
h
'bc/object-
i
d'
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branch 'jk/at-
p
ush-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Haman
o
M
e
r
ge branch 'dl/branch-e
r
ror-
m
essa
g
e
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branch 'jk/
s
ki
p
-http-tests-under-no-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Me
r
ge branch
'
p
s/doc-pac
k
file
-
vs-pack-f
i
le' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge bra
n
ch 'fg/d
o
cument-commi
t
-message-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merg
e
branch 'jk/rer
e
re-f
o
rget-check-enabled'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Ha
m
a
n
o
M
e
rge branch 'pt/pull-lo
g
-n
'
int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Mer
g
e branch
'pt/pull-ff-vs
-
mer
g
e-ff'
into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hama
n
o
Merge b
r
anch 'rs/
p
lug-leak-in-pack-bitm
a
ps' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bra
n
ch 'ja/tutorial-asci
i
docto
r
-
f
ix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Mer
g
e branch 'jk/stripsp
a
ce-
a
sci
i
docto
r
-
f
i
x' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C Hamano
Me
r
ge
b
r
a
n
ch 'jk/as
c
ii
d
oc-markup-fix'
into
maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o C Hamano
Merge branch '
p
s/b
u
n
d
le-verify-arg' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merge branch 'mh/write-refs
-
so
o
ner-
2
.
4' int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merge branch 'mh/ref-directory-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Mer
g
e branch 'mg/log-deco
r
ate-HEAD' int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch 's
b
/t1020-c
l
eanup' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge branch 'jc/gitignore
-
precedence' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
M
e
rg
e
branch '
b
c/connect-plin
k
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Haman
o
Merge branch '
p
h/rebase-
i
-redo' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
Hamano
Mer
g
e branc
h
'jk/add-e-
k
il
l
-editor' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Ha
m
an
o
Merge branch 'mh/c
l
one-verb
o
sity-fix' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
Ha
m
an
o
Merg
e
b
ranch
'
jk
/
sha1-f
i
le-
r
e
duce
-
usel
e
ss-
w
arnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge branch
'
tb/blame-r
e
surrect-convert
-
t
o-git'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
jc/plug-
f
mt-merge-m
s
g-leak' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch 'pt/
x
dg
-
config-path' into
m
a
int
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Haman
o
Sixth batch 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-fr
e
e-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
ge branch 'mm/rebase-i-pos
t
-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'fm/fetch-ra
w
-sha1'
commit
|
commitdiff
|
tree
2015-06-01
J
un
i
o
C
Hamano
Merge branch 'sg/help
-
group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge branch 'm
m
/l
o
g-format-r
a
w-doc'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Haman
o
Merge branch '
d
t/cat-file-follow
-
symlink
s
'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
M
er
g
e bran
c
h '
r
s/janitori
a
l'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Ha
m
a
n
o
M
erge branch 'jk/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io C Hamano
M
erge
b
ranch 'da/mergetool-winmerge
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Merge
b
r
a
n
ch 'mc/commit-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C H
a
mano
Merge branch
'
jh/filter-empty-cont
e
nts'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge branch 'ah/usage-s
t
rings'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge branch
'jk/
h
t
t
p-bac
k
en
d
-deadlock
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Mer
g
e branch 'd
t
/clean-pathspec-filter-
t
hen-lstat'
commit
|
commitdiff
|
tree
2015-05-27
M
i
guel Torroja
p4: retrieve the ri
g
ht revisio
n
of the
f
ile
i
n
UT
F
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Mich
a
el Haggerty
r
e
f
_
transaction_c
o
mmit
(
): do
n
ot capitalize error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
ic
h
a
el Hagg
e
r
t
y
ver
i
fy_lo
c
k(): do not capita
l
ize erro
r
messa
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michae
l
Haggerty
verify_
l
ock(): repor
t
err
o
r
s via a strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff Kin
g
dif
f
.
h
:
rena
m
e DIFF_
P
LAIN col
o
r slot to DIFF_CONTE
X
T
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
dif
f
: accept color
.
diff
.
c
o
ntext as
a
s
y
n
on
y
m
for "p
l
ain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C Hamano
Merge branch 'nd/u
n
tracked
-
cac
h
e'
commit
|
commitdiff
|
tree
2015-05-27
Jeff
King
t7063: hi
d
e stderr from setup
i
n
s
i
d
e prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
ichael Haggert
y
verify_lock(): on
e
rrors, let the c
a
l
l
er unlock the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
i
chael Hagg
e
rty
ve
r
i
f
y_loc
k
(): return 0/
-
1 rather than struct
ref_lock *
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone:
r
e
o
rder
-
-dissociat
e
an
d
--referen
c
e o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff Kin
g
clone: use OPT_
S
TRING_LIST for --refere
n
c
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
diff
.
c
:
-
-
ws-error-highlig
h
t=<kind> option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jun
i
o C Haman
o
diff
.
c: add emit_del_line() and
e
mit_context_l
i
ne()
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 Haman
o
Gi
t
2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Merge branch 'j
k
/still-inte
r
esting' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Haman
o
M
e
r
g
e
branch 'jc/hash-object
'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branc
h
'jk/reb
a
se-quiet-noop' into maint
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C
H
amano
M
e
rge
br
a
nch 'sg/compl
e
te
-
de
c
orate-full-not-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C Hamano
M
erge bra
n
ch 'jk/filte
r
-branc
h
-us
e
-o
f
-sed
-
on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hama
n
o
M
e
rge branch 'jc/daem
o
n-n
o
-
i
p
v6-for-2
.
4
.
1
' into main
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
man
o
Merge
branch 'jk/stash-r
e
qu
i
re-
c
lean-i
n
d
ex' int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Merge branch 'j
k
/git-no-more-argv0-path-mun
g
ing' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
F
ifth b
a
tch f
o
r 2
.
5 cy
c
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
Merge branch
'
nd/untra
c
ke
d
-cache'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C H
a
mano
Merge branch 'r
s
/p
l
ug-lea
k
-in-pa
c
k-bitmap
s
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
M
e
rge branch 'pt/pull-ff-
v
s-me
r
ge-ff
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
Merge b
r
anch 'pt/pull-log
-
n'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Ham
a
no
Merg
e
branch 'jk/re
r
ere-
f
orget-check-
e
na
b
le
d
'
commit
|
commitdiff
|
tree
2015-05-26
L
uke Diamand
git-p4: tests:
u
se test-chmtime
in
p
lace of to
u
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
t4015: separat
e
com
m
on setu
p
and per-test exp
e
ctation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o C H
a
mano
t4
0
15:
m
o
dernise sty
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Ha
m
ano
M
e
rge bran
c
h 'jk/http-backend
-
de
a
dlock-2
.
3
' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
M
e
rge branch 'jk/ht
t
p
-backend
-
dead
l
ock-2
.
2
' i
n
to
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff K
i
ng
http-backend: s
p
ool
ref negotiatio
n
requests t
o
buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Ha
g
gerty
st
r
uct r
e
f_lock: convert old_sha1 member to
o
b
ject_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael H
a
ggerty
war
n
_if_dangli
n
g_
s
ymref(): conve
r
t
loc
a
l varia
b
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Hagg
e
rty
each_r
e
f
_f
n
_adapte
r
(): remove adap
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
rev_list_ins
e
rt_r
e
f(): rem
o
ve
u
nnee
d
ed
arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
a
gg
e
r
t
y
r
e
v_list_ins
e
r
t
_
ref_oid(
)
: new function,
taki
n
g an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
Haggerty
m
a
rk_complete()
:
remove
u
nneeded ar
g
ume
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
mark_complete_oid(): new function, taking an object_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
a
gger
t
y
c
l
ear_marks(): rewrite t
o
t
ake an
o
bject_i
d
argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
c
ha
e
l
H
agge
r
t
y
mark
_
complete(): r
e
write t
o
take an object_id argum
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Hag
g
erty
s
e
n
d
_
r
e
f
(
):
conve
r
t
local
v
a
ri
a
bl
e
"pe
e
led" to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
upl
o
a
d-pack:
r
ewr
i
t
e
functions to take object_i
d
arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
find_sym
r
ef(): convert loc
a
l variable "unused" to
o
bject_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
find_sym
r
ef(): r
e
write to take an obj
e
ct
_
id
arg
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next