repo.or.cz
/
git.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/diagnose-config-mmap-failure'
2015-06-11
Junio C Hamano
Merg
e
branch 'jk/diagnose-confi
g
-mmap-failur
e
'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hamano
Merge br
a
nch
'm
t
/p4
-
depotFile-at-version'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
Ham
a
no
Merge branch '
m
h/verify-lock-e
r
ro
r
-report'
commit
|
commitdiff
|
tree
2015-06-11
J
u
n
io
C Hamano
Merge branch 'jk
/
colo
r
-di
f
f-plain-is-context'
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io C Hamano
Merge branch 'jk/clone-dissociate'
commit
|
commitdiff
|
tree
2015-06-11
J
u
n
io C Hamano
Me
r
ge branch 'jc/d
i
ff-ws-e
r
ror-highl
i
ght'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Juni
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
The first half
o
f the
seventh batch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'ld/p4-editor
-
multi-words'
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge bran
c
h 'bc/objec
t
-
id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merg
e
branc
h
'jk/at-pus
h
-sha1
'
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
M
e
rge branch
'
d
l/branch-error-mess
a
ge' into
m
ai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch
'
jk/ski
p
-
http-tests-under
-
no-curl' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
unio C
Hamano
Merge br
a
nch 'ps/
d
oc
-
packfile-
v
s-pack-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge b
r
a
nch 'fg/document-com
m
i
t-messag
e
-
strippi
n
g
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C H
a
m
ano
Merg
e
branch 'jk
/
rerere-forget-check-enabled' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'pt/
p
ull-l
o
g-n' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
amano
Merge branch
'
pt/
p
u
ll-ff-vs-merge-
f
f'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge bran
c
h
'
r
s/plu
g
-leak-in-pack-bitmaps' into
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merge branch 'ja/tutori
a
l-asciidoctor-fix' into main
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C
Hamano
Merge b
r
anch 'jk/st
r
ipspace-asc
i
i
d
octor-f
i
x' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
a
nch 'jk/asciidoc-marku
p
-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge branch '
p
s/b
u
nd
l
e-
v
erify-arg' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merge bra
n
ch '
m
h/write-refs-s
o
on
e
r-2
.
4' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
branch 'mh/ref-d
i
re
c
tory-file
'
into m
a
in
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C
H
amano
Merge branch 'mg/log-de
c
or
a
t
e
-HEAD' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
m
ano
M
e
rge b
r
anch 'sb/t1020-clean
u
p' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Ham
a
no
Merge branch 'jc
/
gi
t
igno
r
e-precedence'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
amano
Merge branch 'bc/connect-
p
l
ink' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
ma
n
o
Merge branch 'ph/
r
ebase-i-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
ama
n
o
Mer
g
e bra
n
ch 'jk/add-e-kill-editor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
Hamano
Merge
b
ran
c
h 'mh/clone-verbosity-fix' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bran
c
h 'jk/s
h
a1-file-r
e
duce-us
e
less-warn
i
ngs
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge branch 'tb/bl
a
me
-
resurrect-convert-to-g
i
t'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bra
n
ch
'
jc/plug-fmt-
m
erge-msg-leak' in
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Mer
g
e branch 'pt/xd
g
-co
n
fig-path' into main
t
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Sixth batch
f
o
r 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-free
-
at-end
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C H
a
mano
Merge
b
r
an
c
h 'mm/
r
ebas
e
-i-post-re
w
rite-
e
xec'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C
Hama
n
o
Merge branch 'fm
/
f
e
tch-r
a
w-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
a
man
o
M
e
rge b
r
anch 'sg/help-g
r
o
u
p'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Merge branch 'mm/log-form
a
t-raw-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merg
e
branch 'dt/ca
t
-file-f
o
llow-
s
ymlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e branch 'rs/j
a
nit
o
rial
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'jk
/
st
a
s
h-options'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C
H
am
a
no
Merge branch 'da/me
r
getool-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
a
mano
Merge bran
c
h 'mc/commit-doc-gra
m
mofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
erge branch
'
jh/filt
e
r-e
m
pty-cont
e
nts'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
Merge branch 'ah/usage-strings
'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge b
r
anch
'
jk/http-backen
d
-
d
e
a
dlock'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Mer
g
e
branch '
d
t/
c
lean-p
a
ths
p
ec
-
filter-then-lstat'
commit
|
commitdiff
|
tree
2015-05-28
Junio C Haman
o
xmmap(): drop "Ou
t
o
f
m
e
m
o
ry?"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jef
f
King
config
.
c: rewri
t
e
ENO
D
E
V i
n
to EISDIR when mmap
fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
confi
g
.
c: avoid
x
mmap
e
rror messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff
K
ing
c
o
nfig
.
c: fix
m
ma
p
l
e
ak
w
h
en writi
n
g config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
J
eff King
read-cache
.
c:
d
rop PROT_
W
RITE fr
o
m mma
p
of inde
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
i
guel Torro
j
a
p4: retrieve the right
r
evision of the file i
n
UTF
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
r
ef_t
r
ansactio
n
_co
m
mit
(
): do not capita
l
ize error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
i
chael
Haggerty
ver
i
fy
_
lock():
do no
t
capitalize error me
s
sages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ael Haggerty
veri
f
y_
l
ock(): report errors via a strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
e
f
f
King
diff
.
h: rename
DIFF_PL
A
IN
color slot to
D
IFF_CONTEXT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
d
iff: accept color
.
diff
.
context a
s
a synonym
f
o
r "plain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C Hamano
Merge
b
ra
n
ch 'nd/
u
n
t
racked-ca
c
he'
commit
|
commitdiff
|
tree
2015-05-27
J
e
f
f Kin
g
t706
3
:
h
ide stderr
f
rom s
e
tup inside prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael
H
aggerty
verify_lock(): on
errors,
l
et the calle
r
u
nlock the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
verify_lock(
)
: return
0/-1 rathe
r
than
s
truct ref_lock *
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone: reord
e
r
-
-diss
o
ciate and --referen
c
e o
p
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f Ki
n
g
clone
:
use OPT_STRI
N
G_LIST for --reference
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Ju
n
io
C
H
amano
diff
.
c: --ws-error-hi
g
hlight=<kind> option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C
Hamano
diff
.
c: add emit_del_line(
)
and emit_context_lin
e
()
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 Hamano
Gi
t
2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Mer
g
e branch 'jk/s
t
i
l
l-inte
r
est
i
n
g' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Ham
a
n
o
Mer
g
e
branch 'jc/
h
ash-obj
e
ct' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
m
a
no
M
e
r
ge
branch 'jk/rebas
e
-
q
ui
e
t-noop' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge branch '
s
g/complete-decorate-full-not-long'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge
branch 'jk
/
fil
t
e
r-b
r
a
nch-use-of-sed-
o
n-in
c
omplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
Merge br
a
nch 'jc/daemon-no-ipv6-for-2
.
4
.
1
'
into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
a
no
M
erge
b
ranch 'jk/s
t
ash-requir
e
-
clean-index' into m
a
int
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
M
e
rge branch 'jk/git-no-more-ar
g
v0-path-munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Fifth
b
atch for
2
.
5 cyc
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Haman
o
Merge branch 'nd/untracked-cache'
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Ha
m
a
n
o
Mer
g
e
b
r
anch 'rs/plug
-
l
eak-in-pack-b
i
tmaps'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
m
ano
Merge branch 'pt/pull-
f
f-vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Ha
m
ano
Merge branch '
p
t/
p
ull-
l
og-
n
'
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Ha
m
ano
Merge branch
'
jk/rerere-fo
r
get-check-enable
d
'
commit
|
commitdiff
|
tree
2015-05-26
Lu
k
e Diam
a
nd
g
i
t-p4: t
e
sts:
u
se test-chmti
m
e in place of touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
t4015:
s
e
p
arate com
m
on set
u
p and per-
t
est
expectation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
t
4
01
5
:
mo
d
ernise st
y
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
erge
b
ranch 'jk/http-backend-deadlock-2
.
3'
into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk
/
http-backend-d
e
adlock-2
.
2'
i
nto jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff
K
i
n
g
http
-
backend: spool
r
ef negotiati
o
n requ
e
sts to buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Haggerty
s
truct ref_lock: convert old_sha1 member to o
b
jec
t
_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hae
l
Hagge
r
ty
w
arn_if_dan
g
ling_symref():
conve
r
t local v
a
riab
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rt
y
eac
h
_
ref_fn_adapter
(
): remove adapter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
r
ev_list_insert_ref():
remov
e
u
nn
e
ed
e
d argume
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Haggerty
rev_lis
t
_insert_ref_oid(): new fun
c
t
io
n
, taking an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Hagger
t
y
mark_comp
l
ete(): remove unneede
d
argumen
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
Haggerty
m
a
r
k
_
complete
_
o
i
d
(
)
: new function, taking
an object
_
oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next