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 'mh/verify-lock-error-report'
2015-06-11
Junio C Hamano
M
erg
e
branch '
m
h
/
verif
y
-l
o
ck
-
error-report'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Ha
m
an
o
Merge branch 'jk/color
-
diff-pla
i
n
-is-con
t
ext'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hama
n
o
M
e
r
g
e bra
n
ch 'jk/cl
o
ne-disso
c
iate'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
Haman
o
M
e
rge bran
c
h
'
jc/diff-ws-error-highlight'
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
m
a
no
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
am
a
no
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io
C Ha
m
ano
The first hal
f
of the sev
e
nth batch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'ld/p4-editor-mult
i
-
words'
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Ha
m
ano
Merge
branc
h
'bc
/
o
bject
-
id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merg
e
branch '
j
k/a
t
-push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
m
ano
Merge branc
h
'dl/branch-error-message
'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
branch 'j
k
/skip-ht
t
p-tests-under-no-cu
r
l'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Haman
o
Merge
branc
h
'ps/d
o
c-packf
i
l
e-vs-pack-f
i
le' in
t
o
ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge br
a
nch 'fg/document-commit-message-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
j
k/
r
erere-forget-
c
heck
-
e
nab
l
ed
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
M
erge branch 'pt/pull-l
o
g-n' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merge branch '
p
t/pull
-
ff-vs-mer
g
e
-
ff' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge branch '
r
s/plug-leak-in-
p
ack-b
i
tma
p
s' into
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Me
r
ge branch 'ja/
t
utoria
l
-ascii
d
octo
r
-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Ha
m
ano
Merge branch
'
jk/st
r
ipspace-ascii
d
octor-fix' in
t
o m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge bra
n
ch 'jk/asciidoc-mar
k
up-fi
x
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Ham
a
no
Merg
e
b
r
anch 'ps
/
bundle-veri
f
y-arg
'
into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
m
ano
Merge branch 'mh/write-refs-soon
e
r-2
.
4
'
into
ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'mh/ref-direc
t
or
y
-file' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
M
erge branch 'mg/
l
og-d
e
c
o
ra
t
e-HEAD
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
e
rge
bran
c
h 'sb/t1020-cleanup'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
Hamano
Merge br
a
nch 'jc/gitignore-precedence' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
a
m
ano
M
erge bran
c
h 'bc/connect-plin
k
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
Hamano
Merge b
r
anch 'p
h
/rebase-i-redo'
in
t
o
m
ai
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hama
n
o
Merge bra
n
ch
'jk/add-e-kill-edito
r
' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merge
b
ranch 'mh/cl
o
ne-verbosity-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge
branch 'jk/sha1-fi
l
e-reduce-useless-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
Hamano
M
e
r
g
e branch 'tb
/
b
l
ame-resurrect-convert-to-
g
it' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge bra
n
c
h
'
j
c/plug-
f
mt-merge-msg-
l
eak
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
amano
Mer
g
e
b
ranch
'
p
t/xdg-config-pa
t
h
' into maint
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o C Hamano
Sixth batch for 2
.
5 c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge
bran
c
h
'sb/te
s
t
-bitm
a
p-
f
ree-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge bra
n
c
h 'mm/rebase-i-post-rewrite-exe
c
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
man
o
Mer
g
e
branch 'fm/
f
etch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
branch 'sg/
h
elp-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge
b
r
anc
h
'mm/log-
f
orma
t
-ra
w
-doc'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Mer
g
e
b
ranch '
d
t/cat-
f
i
l
e
-follo
w
-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Haman
o
M
e
r
ge br
a
nch
'
rs/janito
r
ial
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Ham
a
n
o
Merge branch '
j
k/stash-o
p
tions'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
a
n
o
M
er
g
e branch 'da/me
r
ge
t
ool-winm
e
rge
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
M
erge bra
n
c
h
'mc/commit-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Merge branch 'jh/filte
r
-empty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C
H
aman
o
M
e
rg
e
branch 'ah/u
s
age-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Mer
g
e branch 'jk
/
http-ba
c
ke
n
d
-
deadlock
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
r
ge bran
c
h
'
dt/c
l
ean-p
a
thspec-f
i
lter-then-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Mich
a
el Haggerty
ref_tr
a
nsa
c
tion_commit(): do not capitali
z
e
e
rror
m
essages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael
H
aggert
y
verify_lo
c
k()
:
do
n
ot capi
t
a
lize error messag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
i
c
h
ael Hagge
r
ty
v
e
r
ify
_
lock(): report errors
v
ia a strbu
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff
.
h
:
rename
DIFF_PLAIN c
o
lor slot to DI
F
F
_
CONTE
X
T
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
K
i
n
g
diff: acce
p
t color
.
diff
.
context as a sy
n
onym
f
or "plain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C
H
a
m
a
n
o
Merge bran
c
h
'nd
/
untr
a
cked
-
cac
h
e
'
commit
|
commitdiff
|
tree
2015-05-27
J
eff King
t7063: hide
stderr
from setup
inside prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
ich
a
el
Haggerty
ve
r
ify_lock(): on err
o
rs, let the c
a
lle
r
unl
o
ck the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ael Haggerty
ve
r
ify_lock(
)
: re
t
urn 0/-1 rat
h
er t
h
a
n
struct ref_
l
ock *
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone: reo
r
d
er --diss
o
ciate and --referen
c
e opt
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
ing
clone: use OPT_STRING
_
LIST
f
o
r --reference
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
unio C
Hamano
diff
.
c: --ws-error-highlight=<kind
>
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
u
n
io C Hamano
diff
.
c: add emit_del
_
li
n
e(
)
an
d
emit_contex
t
_lin
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
am
a
no
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
J
un
i
o C Ham
a
no
Merge b
r
anch '
j
k/sti
l
l-int
e
resting' into maint
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
i
o
C
Ha
m
an
o
Merge branch 'jc/hash-obj
e
c
t' into main
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
Merge bra
n
ch 'jk/rebase
-
q
uiet-no
o
p' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
b
r
anch
'
s
g
/
c
o
mplete-de
c
orate-ful
l
-not-l
o
n
g
' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge branch '
j
k/filte
r
-branc
h
-use
-
o
f-s
e
d-
o
n-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Merge bra
n
c
h 'jc/d
a
emon-no-ipv6
-
for-2
.
4
.
1' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
rge branch 'jk/s
t
a
s
h-re
q
uire-clean-
i
ndex
'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'j
k
/
g
it-no-more-argv0-path
-
mungi
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hamano
Fifth batch for
2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C
H
a
m
a
no
Merge b
r
anch
'
nd/untrac
k
ed-cache'
commit
|
commitdiff
|
tree
2015-05-26
J
unio
C
H
amano
Mer
g
e branch
'rs/p
l
ug-leak
-
in-pack-bitmaps'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
mano
Merge branch
'
p
t
/p
u
ll-ff-vs-merge-
f
f'
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
m
ano
Merge branch 'pt
/
p
u
ll-
l
og-n'
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Me
r
g
e branch '
j
k/
r
erere-for
g
e
t
-c
h
eck-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Lu
k
e D
i
amand
g
i
t
-p4: tests
:
use test-ch
m
time i
n
plac
e
o
f
touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
t4015: separate common setup and per
-
tes
t
e
x
pecta
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
t4015: modernise style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Hama
n
o
Merge branch 'jk/h
t
tp-backend-deadlo
c
k-2
.
3' into
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Merge br
a
nch 'jk/h
t
tp
-
back
e
n
d
-deadlock-2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
http-backend: s
p
ool ref ne
g
otiation request
s
to bu
f
fer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
struct ref_lock: convert old_sha1 me
m
ber to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
H
aggerty
war
n
_
i
f
_dangling_symref(
)
:
conver
t
loc
a
l variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ich
a
el Hag
g
erty
ea
c
h_ref_fn_adapter(): rem
o
v
e ad
a
p
ter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
rev_
l
ist_i
n
sert_ref
(
): remove un
n
eeded argume
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
r
e
v
_
list_in
s
ert_
r
ef_oid(): new fu
n
ction, taking
an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
m
a
rk_complete():
remove unneeded arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
mark_complete_oid(): new function, taki
n
g an object_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael H
a
ggerty
cl
e
ar_
m
arks()
:
rewri
t
e to take an objec
t
_id argum
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
mark_comple
t
e(): r
e
write to take a
n
object
_
id arg
u
m
e
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
send_ref()
:
convert local
v
ariable "peeled
"
to
o
bject_i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
upload
-
pack:
rewrite functions to take object_
i
d
arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
find_symr
e
f
(
):
convert local
v
a
riable "unus
e
d" to obje
c
t_i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
cha
e
l Haggert
y
fi
n
d_symre
f
(): rewrite to take
an object_id arg
u
m
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Hagger
t
y
write_one_ref(): rewr
i
te to
t
ake an obje
c
t_id
arg
u
m
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
agg
e
rty
write_refs_to_temp_dir(): convert local
v
ariable sha1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next