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 'pt/pull-ff-vs-merge-ff'
2015-05-11
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Ham
a
n
o
Sync with 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Git
2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Haman
o
Merge b
r
anch 'mm/usage-l
o
g-l
-
can-take-regex' into
m
aint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
n
o
Merg
e
b
r
a
n
ch
'
j
c/dif
f
-no-i
n
d
e
x-
d
-
f
' in
t
o
maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merge branc
h
'oh/fix
-
c
o
nfig-defa
u
lt-u
s
er-name-sectio
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge bran
c
h
'
jc/epocht
i
me-wo-tz' into
m
aint-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Ha
m
an
o
S
e
cond batch
f
or 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge bran
c
h 'pt/xdg-c
o
n
f
ig-path
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch 'ep/do-n
o
t
-
feed-a-pointer-
t
o-array-si
z
e'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
m
a
n
o
Merge bran
c
h 'jc/hash-obj
e
ct'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hama
n
o
Merge br
a
nch 'sb/prefix-path-free-resu
l
ts'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o C Hamano
M
erge branch 'sg/co
m
pletion-no-red
u
ndant-all
-
command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Ha
m
ano
Merge branch
'sg/complete
-
d
e
c
orate
-
full
-
n
ot-long'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jk/filter-branch-use-of-sed-on-
i
n
c
omplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Hama
n
o
Merge
branch 'jc/daemon-no-
i
p
v
6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Haman
o
Merge branch 'j
n
/cl
e
an-use
-
error-not-fpri
n
tf-on-s
t
d
e
r
r'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge branch 'tb/
b
la
m
e-resurr
e
c
t
-
convert-to
-
g
it'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hamano
Me
r
ge branch 'va/fi
x
-git-p4-tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
er
g
e branch 'ld/p4-
c
ase-f
o
l
d'
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
i
o C
H
amano
Me
r
g
e branch 'jk/rebase-quiet-n
o
o
p'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Me
r
ge br
a
nch '
v
a/
p
4
-client-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'mm/add-p-split-e
r
ror'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'tb/t0027-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge branch 'ls/p4-changes-bl
o
ck-s
i
ze'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
ma
n
o
Merge branch 'jc
/
plug-f
m
t-merge-msg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
H
amano
Merge b
r
anch
'
nd/slim-ind
e
x
-
pack-memory-
u
sage
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ham
a
no
Merge bran
c
h 'jk/still
-
i
n
teresting'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jk/reading-packed-refs'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C
Hama
n
o
Merg
e
b
ra
n
c
h '
l
m/squel
c
h-bg
-
pr
o
gress'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ham
a
no
Mer
g
e branch 'jk/sh
a
1-file-reduce-u
s
eless-warnings'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge br
a
n
c
h '
n
d/multiple-work-trees
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Ha
m
ano
Merge b
r
anch 'pt/credential-xd
g
'
commit
|
commitdiff
|
tree
2015-05-11
M
i
cha
e
l Hagg
e
rty
reflog_expire(): integr
a
te lo
c
k
_ref_sha1_bas
i
c
(
) error
s
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michael Haggerty
ref_tra
n
saction_
c
o
m
m
it(): dele
t
e extra "the" fr
o
m erro
r
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
M
i
c
hael Hagger
t
y
r
ef_transaction_commit(): p
r
ovide better error
m
e
ssages
commit
|
commitdiff
|
tree
2015-05-11
Mi
c
hael Haggerty
rename_ref():
i
ntegrate
l
ock_ref_sha1_
b
a
sic() errors
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michael
Hagger
t
y
lock_ref_sha1_bas
i
c(): improve diagnostics for ref
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mi
c
ha
e
l H
a
ggerty
l
o
ck_ref
_
sha1_basic(
)
: report err
o
rs v
i
a
a "struct
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mi
c
h
a
el Hagger
t
y
verify_refna
m
e_avai
l
abl
e
(): report error
s
via a
"struct
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
M
i
c
h
ael Haggerty
v
erify_ref
n
ame_
a
vailable(): rename function
commit
|
commitdiff
|
tree
2015-05-11
M
i
c
hael Hagger
t
y
r
ef
s
: check for D/F conflicts amo
n
g
refs
c
re
a
te
d
in
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michael Haggerty
ref_transaction_
c
ommit(): us
e
a string_list for detectin
g
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mich
a
el H
a
g
g
e
r
ty
is_
r
efname_avai
l
able(): use di
r
name in first loop
commit
|
commitdiff
|
tree
2015-05-11
Michael H
a
ggerty
struct nonmatching_ref_data: stor
e
a
refname instead
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michael Haggerty
re
p
ort_
r
efna
m
e_conflict():
i
n
li
n
e funct
i
on
commit
|
commitdiff
|
tree
2015-05-11
Mich
a
el Haggerty
entry_matches
(
): inline fu
n
ction
commit
|
commitdiff
|
tree
2015-05-11
M
i
chael Haggerty
is_refname
_
available
(
): convert local va
r
iabl
e
"dirna
m
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
M
i
chael Hag
g
e
r
t
y
is_refname_
a
v
ail
a
ble(): a
v
oid shadowing "
d
i
r" variab
l
e
commit
|
commitdiff
|
tree
2015-05-11
Mi
c
hael Haggerty
is_refname_available(): reva
m
p the comment
s
commit
|
commitdiff
|
tree
2015-05-11
Michael
Haggerty
t
1
404: new tests
o
f ref D
/
F c
o
n
f
licts wit
h
in t
r
ans
a
c
t
i
o
ns
commit
|
commitdiff
|
tree
2015-05-11
Stef
a
n Beller
refs
.
c: remove lock_fd
f
r
o
m
struct ref_
l
ock
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-10
Ste
f
an Belle
r
update-ref: test handling large transactions properly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-08
Sébastien
Guimmara
command-list
.
t
xt: fix whitespace inconsistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-08
D
a
nn
y
Lin
c
o
n
t
ri
b
/subt
r
ee: portab
i
lit
y
fi
x
fo
r
st
r
ing printing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-08
L
ars Kellogg-Stedman
ht
t
p
:
ad
d
sup
p
ort f
o
r
s
p
ecifying an SSL ci
p
her list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-08
Patrick
Steinhard
t
bun
d
l
e
: v
e
rify arg
u
m
e
nts more strictly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-07
Danny Li
n
cont
r
ib/subtre
e
:
t
h
ere's no
pu
s
h
--squ
a
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
t
es
t
s: skip dav http-push
t
ests under NO_EXPAT=NoThanks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-07
J
eff King
t
/
lib-ht
t
pd
.
sh: skip tests if
N
O_CURL is de
f
ined
Noticed-by:
Junio C Hamano
<junio@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
SZEDER Gábor
comp
l
et
i
o
n
: remo
v
e creden
t
ial helpers f
r
om
porc
e
lain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Kart
h
ik
Naya
k
t1006: add tests
for git cat-
f
ile --allow-u
n
known-typ
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
K
a
rth
i
k Nayak
cat-file: teach cat
-
file a '-
-
allow-unknown-type' option
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Karthik Nayak
cat-fi
l
e: make the
options mutually exclusive
...arguments. This was written by
Junio C Hamano
,
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Kar
t
hi
k
N
ayak
s
h
a1_fil
e
:
s
u
p
port reading from a
l
o
ose object
o
f
unkn
o
wn
.
.
.
...structure. This was written by
Junio C Hamano
but tested
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Danny Lin
branch:
d
o not call a "remote-tracking
branc
h
" a "re
m
ot
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
path
.
c: remove home_config_paths()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul T
a
n
git-conf
i
g: replace
use of home_
c
onfig_paths()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
u
l T
a
n
git-co
m
mi
t
: replace u
s
e
of
h
o
me_config_
p
at
h
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
cre
d
en
t
ial-store
.
c: replace home_config_p
a
ths()
w
it
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
dir
.
c:
r
e
p
l
ace home_config_pat
h
s
() with xd
g
_confi
g
_h
o
me(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Ta
n
attr
.
c:
replace home_
c
o
n
fig_paths() with xdg_
c
onfig
_
home()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Pa
u
l Tan
path
.
c: impleme
n
t xd
g
_
config_home()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o
C
Hamano
First batch for
2
.
5
cy
c
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C Hamano
Merge br
a
nch 'j
k
/prune-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge bran
c
h 'mm/usage-log-l-can
-
take-reg
e
x'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merg
e
branch 'ep/fix-test-
l
ib-function
s
-report'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Merge branch 'cn/
b
om-in-g
i
t
i
gno
r
e'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Me
r
ge b
r
anch 'jc/epochti
m
e
-wo-t
z
'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C H
a
mano
Merge branch 'nd/t1509-chroot-t
e
st'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merg
e
branch '
o
h
/
fix-conf
i
g-d
e
fault-use
r
-name-section'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
Hamano
M
erge branc
h
'jk/type-fr
o
m-string-gently'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Ha
m
ano
Me
r
ge branch 'sb/test-bitmap-free
-
a
t
-en
d
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge bra
n
ch '
l
d/
p
4-
f
i
lety
p
e-detect
i
o
n'
commit
|
commitdiff
|
tree
2015-05-06
J
un
i
o C Hamano
Merge branch 'ts
/
checkout-advice-pl
u
ral'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
an
o
Merge branch 'jk/init-core-work
t
ree-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merg
e
branch 'mh/show-bra
n
ch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge
b
ranch 'sb/l
i
ne-log-plu
g
-pairdiff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bra
n
ch 'jc/diff
-
no-index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C H
a
mano
Merge branch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
Elia Pint
o
g
it-compat-util
.
h
:
impl
e
ment a
d
ifferent ARRAY_SIZE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
daemon: unb
r
eak NO_IP
V
6 build regres
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Stefan
B
el
l
er
prefix_path(): unc
o
ndi
t
ionally free results i
n
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Ha
m
ano
write_sha1_file(
)
: do not use a s
e
parate sha
1
[
] a
r
ray
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Eric Sunshine
t1007: add hash-object --literally tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Er
i
c Sunshine
h
ash-object
-
-li
t
erally: fix
b
uf
f
er
overrun wi
t
h extra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-04
Jonathan
N
ieder
config: use error()
i
nst
e
ad of fprintf(s
t
derr,
.
.
.
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-04
Er
i
c
Sunshine
git-hash-object
.
txt: docu
m
ent -
-
literally
o
p
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
SZEDE
R
Gá
b
or
completion: fi
x
a
nd updat
e
'g
i
t
lo
g
--decorate=' opti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
SZEDE
R
Gábor
completion: remove redundant __gi
t
_comput
e
_
a
ll_com
m
ands
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next