repo.or.cz
/
git
/
mingw.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
Jun
i
o C Hamano
Merge
branch 'mt/p4-depotFile-at-
v
ersion'
commit
|
commitdiff
|
tree
2015-06-11
J
u
n
io
C Hamano
M
e
r
ge b
r
anch 'mh/
v
e
r
i
f
y-loc
k
-error-r
e
p
o
rt'
commit
|
commitdiff
|
tree
2015-06-11
J
un
i
o C
H
amano
Merge branch 'jk/color-diff-plain-i
s
-context'
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C Ham
a
no
Merge branch 'j
k
/clone-dissociate'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Haman
o
Me
r
ge branch 'jc/
d
iff-ws-e
r
r
o
r
-
highlight'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hama
n
o
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
T
he
first hal
f
of the seventh ba
t
ch fo
r
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge
b
ranch 'l
d
/p4-edito
r
-multi-w
o
rds'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
an
o
Merge branch 'bc/o
b
ject-id'
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge
b
ranch 'jk/at-push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
M
erge branc
h
'd
l
/branch-error-messag
e
'
into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e bra
n
ch 'jk/sk
i
p-http-t
e
sts-u
n
der-no-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e
branc
h
'ps/doc-pac
k
file-vs
-
pack-
f
ile' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
f
g/docu
m
e
n
t-
c
omm
i
t-message-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch 'jk/re
r
ere
-
f
orget-check-e
n
abled'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch 'pt/pu
l
l-log-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merg
e
b
r
an
c
h
'p
t
/p
u
l
l
-
ff-vs-
m
erge-ff' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
M
e
r
ge
b
ran
c
h
'r
s
/
plug
-
leak-in-
p
ack-bitma
p
s' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch
'ja/tutorial-
a
sci
i
doctor
-
fix'
i
nt
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C Hamano
Merge b
r
an
c
h 'jk/str
i
p
s
pace
-
a
s
ciidoctor-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
a
no
Merge b
r
anch
'jk/as
c
iido
c
-
m
arkup-f
i
x' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch 'p
s
/bundle-verify-arg' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merg
e
branc
h
'
mh/write-ref
s
-soo
n
e
r
-
2
.
4' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge bra
n
ch 'mh/ref-d
i
rectory-file' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch 'm
g
/log-d
e
corate-HEAD'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
H
a
mano
Merge
b
ranch 'sb/t
1
020-cleanup' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
M
e
r
ge
branch
'
jc
/
g
i
t
ignore-precedence' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Mer
g
e
branch '
b
c/connec
t
-plink' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch 'ph/rebase-i-redo' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Ha
m
ano
Merg
e
branch 'jk/add
-
e-kill-editor' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge b
r
anch '
m
h/clone-v
e
rbosity-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Hamano
Merge branch '
j
k/sha1-file-reduc
e
-usele
s
s-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
tb/bl
a
me-resurrect-convert-to-git'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
g
e b
r
anch 'jc/plug-fmt-
m
erge-ms
g
-
leak
'
in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Ha
m
a
no
M
e
r
ge branch 'pt/xdg
-
c
o
nfig-p
a
th'
into maint
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hama
n
o
Sixth
b
atch f
o
r 2
.
5
c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merg
e
b
ranch 's
b
/t
e
st-
b
itmap-free-at-end'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C H
a
ma
n
o
M
e
rge branch 'mm/reba
s
e-i
-
p
o
st-
r
ewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C H
a
mano
Merge branch 'fm/fetch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
branch
'
s
g
/help-
g
roup
'
commit
|
commitdiff
|
tree
2015-06-01
J
uni
o
C Hama
n
o
Merge branch 'mm/log-f
o
rmat-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Ham
a
no
Mer
g
e br
a
n
c
h 'dt
/
cat-fi
l
e-follow-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
g
e branch
'
rs/janit
o
ri
a
l'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hama
n
o
Merge branch
'
jk
/
stash-opt
i
o
n
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge branch
'
da
/
mer
g
etool-winm
e
rg
e
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge branch 'mc/c
o
mmit-doc
-
gramm
o
f
ix
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Haman
o
Merge branch 'jh/filter-empty-
c
ontents'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
Merge branch 'ah/usage-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
a
m
a
no
Merge branch 'jk/
h
ttp-backe
n
d-deadl
o
ck'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Ham
a
n
o
Merge
b
r
a
nch 'dt/clean-
p
athsp
e
c-filter-then-lst
a
t
'
commit
|
commitdiff
|
tree
2015-05-27
Migue
l
T
or
r
oja
p4: retr
i
eve the right revision of the file in UTF
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ael Haggerty
ref_transaction_commit(): do not capitalize er
r
or messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
verify_lock():
d
o
n
o
t capitalize error
m
essages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
v
e
rify_
l
ock(): report er
r
ors via a strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff
.
h: rename DIF
F
_PLAIN color slot t
o
DIFF_CO
N
TEXT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff Ki
n
g
di
f
f
:
acce
p
t color
.
diff
.
context
a
s
a
synonym for "p
l
ain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
unio C H
a
mano
Me
r
ge branch 'nd/untracked-c
a
che'
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff King
t7063:
h
ide s
t
derr from setup
i
nside pre
r
eq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
verify_lock(): on errors,
let
t
he
caller unlock the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
verify_lock(
)
: return 0/
-
1 rather t
h
an s
t
ruct ref_lo
c
k *
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone: reorder --
d
issociate and --reference
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone:
u
se OPT_STRING_LIST for --re
f
e
rence
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jun
i
o C
H
aman
o
d
i
ff
.
c:
--w
s
-er
r
or-
h
ighlight=
<
ki
n
d
>
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Ham
a
no
diff
.
c: add emit_del_line() and
e
mit
_
cont
e
xt_line(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Sy
n
c with
2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
G
it
2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge b
r
anch '
j
k
/
still-i
n
teresting'
into main
t
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C H
a
m
a
no
Merge branch 'jc/hash
-
object
'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
J
un
i
o
C
Hamano
Merge branc
h
'jk
/
r
e
b
a
s
e-qui
e
t-noop'
into
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Merg
e
branch 'sg/
c
omple
t
e-de
c
orate-f
u
ll-not-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Ha
m
ano
Merg
e
b
ra
n
ch 'jk/filter-branch
-
use-of-sed-on-incomp
l
ete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
aman
o
Merge branch
'jc
/
daemon-no-ipv6
-
for-2
.
4
.
1'
i
nt
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hamano
Mer
g
e br
a
nch 'jk/stas
h
-
r
e
quire-clean-inde
x
' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
M
e
rge
b
r
anc
h
'
jk/git-no-more-argv0-path-m
u
nging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C
Haman
o
Fifth ba
t
ch for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C H
a
mano
Merge branch 'nd
/
un
t
racked
-
c
a
che'
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge branch 'rs/plug-leak-in-pack-bitmap
s
'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hamano
Merge b
r
a
n
ch
'
p
t
/
pull-ff-vs-me
r
ge-f
f
'
commit
|
commitdiff
|
tree
2015-05-26
J
unio
C
H
am
a
no
Merge
b
ranch 'pt/pu
l
l-l
o
g-n'
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Ham
a
no
M
erge br
a
nch 'jk/rerere-forget-
c
h
eck-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Lu
k
e Diamand
git-p4: tests: use test-chmtime in
place
of touc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C Hamano
t40
1
5: separate
common setup an
d
per-
t
e
s
t
e
xpectation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
t4015: m
o
dernise sty
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C
H
amano
Me
r
ge br
a
nc
h
'jk/http-ba
c
k
e
nd-deadlock-2
.
3' into
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk/h
t
t
p
-backend-deadlock-2
.
2' int
o
jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
http-backend: spool
r
e
f negotiatio
n
r
e
quests to buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
struct re
f
_lock: conv
e
rt old_
s
ha1
m
ember
t
o
o
bjec
t
_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
warn_i
f
_dangling_sym
r
ef(): convert
l
oca
l
variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ic
h
ael Ha
g
gerty
each_ref_f
n
_adapter(): remove adapter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
ha
e
l
Hagger
t
y
r
ev_list_insert_r
e
f(): remove unneeded arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hagge
r
ty
r
e
v
_list_ins
e
rt_ref_o
i
d(): new
f
unction, taki
n
g an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
erty
mark_complete(): remov
e
unne
e
d
ed argu
m
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
r
t
y
mark_complete_oi
d
(
): new function,
t
aki
n
g an
o
bject_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
c
lear_marks(): rewri
t
e
to ta
k
e an object_i
d
a
r
gument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
mark_com
p
lete():
r
ewrite t
o
take an obj
e
c
t
_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
send_re
f
(): con
v
ert l
o
c
al
variable
"
peele
d
"
to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hagger
t
y
uploa
d
-pack: r
e
write
fu
n
ctions to take o
b
je
c
t_id argu
m
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Hagger
t
y
find_symref(): convert local variable "unused" to object_
i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
a
e
l
Haggerty
find_symref(): rewrite
to take an obj
e
ct_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next