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
Junio C Hamano
Merge b
r
anch 'mt/p4-depotFile
-
at-version
'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge
branch
'
m
h/verify-l
o
ck-error-report'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio C Hamano
Merge branch 'jk
/
c
o
lor-diff-p
l
ain-is-c
o
ntext'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
M
e
rge branch 'jk/clone-dissociate'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C H
a
mano
Merge branch 'jc/diff-ws-error-high
l
ight'
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
H
aman
o
S
ync with
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
G
it 2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C
Hamano
The fir
s
t half of the seventh batch f
o
r 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge branch 'ld/p4-
e
dit
o
r-mul
t
i-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merge b
r
an
c
h 'b
c
/
ob
j
ec
t
-id'
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branc
h
'
j
k/at
-
pu
s
h
-s
h
a1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ranch 'dl/br
a
nch-
e
rror-me
s
sage
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
J
un
i
o C Ham
a
no
Merge branch 'jk/skip-http
-
t
ests-
u
nder-no-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branch 'p
s
/
doc
-
p
a
ckfi
l
e-vs-
p
a
ck-fil
e
' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Me
r
ge branch 'fg/document-commit-
m
e
s
s
age-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Mer
g
e branch 'j
k
/rerere-forget-c
h
eck-enabled' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'pt/
p
ull-log-n' int
o
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C
H
amano
Merg
e
branch 'pt/pull-ff-vs
-
merge-ff
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merg
e
branch 'rs/p
l
ug
-
l
e
ak-in-pack-bitmaps' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge branch 'ja/t
u
to
r
ial-ascii
d
octo
r
-fix'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
r
anch 'jk/stripspace-asciidoctor-fix' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch
'
j
k/asciidoc-markup
-
f
i
x' in
t
o m
a
in
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o C Hamano
Merge branch 'ps
/
bundle-verify-arg' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io
C
H
a
mano
Me
r
ge branc
h
'mh/write-refs-sooner
-
2
.
4'
i
nto
main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
er
g
e branch 'm
h
/ref-directory-file' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hama
n
o
Merge branch 'mg/log-decora
t
e-HEAD
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
un
i
o
C Hamano
Mer
g
e branch
'sb/t
1
0
2
0
-cleanup' i
n
t
o main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch 'jc/g
i
ti
g
n
o
re-precedence' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branc
h
'bc
/
conn
e
ct-pl
i
nk' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge b
r
a
nch 'ph/rebase-i-r
e
do' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C Hamano
M
e
rge bran
c
h 'jk
/
add-e-kill-e
d
itor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merg
e
branc
h
'mh/clone-
v
erbo
s
ity-fix' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branch '
j
k
/
sha1-file-redu
c
e-useless-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'tb/bla
m
e-resurrect-convert-to-
g
it' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
mano
Merge branch 'jc/
p
lug-fmt-merge-msg-leak
'
i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'pt/xd
g
-config-path' into maint
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Sixth batch for 2
.
5
c
ycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Me
r
ge branch
'
sb/test-bitmap-f
r
ee-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C
Hamano
M
e
r
g
e
b
r
a
nch 'mm/rebase-i-post-rewrite-e
x
ec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Merge
br
a
nch 'fm/fe
t
c
h
-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge br
a
nch 'sg/help-grou
p
'
commit
|
commitdiff
|
tree
2015-06-01
J
u
ni
o
C Ha
m
ano
Merge branch 'mm/log-f
o
rmat-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Ha
m
ano
Me
r
ge bran
c
h 'dt/cat-file-follow-symlinks
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
a
n
o
Merge branch 'rs/janitorial'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
am
a
no
Merge branch 'jk/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'da/mergetool-winm
e
rge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
Merge bra
n
c
h
'mc/commit-doc-grammofi
x
'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o C
H
aman
o
M
e
rge branch 'jh/filter
-
empty-c
o
ntents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Merge br
a
nch 'ah/
u
sage-str
i
ngs'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
Merge branch
'
jk/http-back
e
n
d-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
Merge
branch 'd
t
/clean-pathspec-filter-then-lstat
'
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torroja
p4:
ret
r
ieve th
e
right revision of the file
in UT
F
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michae
l
Haggerty
ref_transaction_commit(): do not
capitalize error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ael Haggerty
verify_lock(): do no
t
capitalize er
r
o
r me
s
sages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Hagg
e
r
t
y
v
eri
f
y
_lock()
:
report
e
rrors via a
s
trbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
eff
K
ing
diff
.
h: rena
m
e DIFF_PLAIN color slot to DI
F
F_CONTEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
in
g
diff: accep
t
co
l
or
.
diff
.
c
o
ntext
a
s a
synonym for "plain"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C
H
ama
n
o
Me
r
ge branch 'nd/untracked-cac
h
e'
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
ing
t7063: hide stderr fr
o
m
setup inside prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ael Hagg
e
rty
verify_lock(): on errors, let the cal
l
er
u
n
l
oc
k
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
veri
f
y_lock():
r
eturn
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: reorder
-
-
d
i
ssocia
t
e an
d
--re
f
e
r
ence options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff K
i
ng
clone
:
u
s
e OPT_ST
R
ING
_
LIST f
o
r --re
f
e
rence
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
di
f
f
.
c: --
w
s-error-highligh
t
=<kind> optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Ju
n
i
o
C
H
amano
di
f
f
.
c: add emit_d
e
l
_
li
n
e()
and emit_con
t
ext_line()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C H
a
man
o
S
ync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
G
it 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Merge bra
n
ch 'jk
/
st
i
ll
-
in
t
e
r
esting' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge br
a
nch 'jc/hash-
o
bject'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hamano
Merge branch 'jk/
r
ebase-quiet
-
noop' into maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
M
er
g
e branch 'sg/
c
omplete-decorate
-
full-
n
ot-long'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk/filte
r
-branch-use-of-sed-on-incomple
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
rge
branch 'jc/daemon-no-ipv6-for-2
.
4
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
m
ano
Merge branch 'jk/stash-require-clean-
i
ndex' int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Ham
a
no
Merg
e
branch 'jk/git-no-more-argv0-path-munging' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hama
n
o
Fif
t
h
b
atch fo
r
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C
Hamano
Me
r
ge branc
h
'nd/untrac
k
e
d-cache'
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C
H
amano
Merge br
a
nch 'rs/p
l
ug-le
a
k-i
n
-p
a
ck-bitm
a
p
s'
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Merge
b
ranch 'pt/pull-ff-vs-mer
g
e
-
ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
Merge
branch 'pt/pull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Me
r
ge b
r
anc
h
'jk/rerere-
f
orget-check-
e
nabled'
commit
|
commitdiff
|
tree
2015-05-26
L
u
k
e Diamand
git-p4: t
e
sts: use test-chmtime in
place of touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hama
n
o
t4015:
sep
a
rate
common setup an
d
per-test expectation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
unio C
Hama
n
o
t4015: modern
i
se style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C
Haman
o
M
e
rg
e
branch
'jk/http
-
b
a
cke
n
d-de
a
dl
o
c
k
-2
.
3
'
into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bran
c
h 'jk/http-backend-deadlock-2
.
2'
i
nt
o
jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Je
f
f King
http-backend: spool
ref
n
egotiation
r
eque
s
ts to buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
h
ael Hagg
e
rty
struct ref_lock: conve
r
t old_sha1 m
e
mber to
o
bj
e
ct_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael
H
aggerty
warn_if_dangling_symref(): conver
t
loca
l
vari
a
ble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
e
a
ch_ref_fn_ad
a
pter
(
): remove adapter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hag
g
e
rty
rev_lis
t
_insert
_
ref(): r
e
mo
v
e unne
e
d
ed argument
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
e
l Haggerty
rev_
l
ist_insert_ref_oi
d
(
)
: new
fun
c
t
ion, tak
i
ng
an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
mark_complet
e
(): remove
unn
e
eded a
r
gument
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
m
a
rk_complete
_
oid():
n
ew
f
unction, taking
an object_o
i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
c
l
e
a
r_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 H
a
ggerty
m
a
rk_complete(): r
e
write to take
a
n
object_i
d
argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Haggerty
send_ref(): co
n
vert local varia
b
le "peeled" to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
er
t
y
uplo
a
d
-pack: rewrite
f
u
n
ction
s
to take object_id
a
rguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
find_symref(): conve
r
t l
o
cal variable "unuse
d
" to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
e
r
ty
find_symref(): re
w
r
ite
to t
a
ke an object_
i
d argumen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next