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-tags-error-diag'
2015-05-11
Junio C
H
amano
Me
r
g
e
br
a
nc
h
'mm/add
-
p-split-e
r
ror'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
ra
n
c
h
'tb/t002
7
-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge
b
ranch 'ls/p4-change
s
-block-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jc/plug-fmt-merg
e
-msg-leak'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Hamano
M
erge branc
h
'
nd/sli
m
-
index
-
pack-
m
emory-usage'
commit
|
commitdiff
|
tree
2015-05-11
J
un
i
o
C
Hama
n
o
Merg
e
branch 'jk/
s
till-interesting'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bran
c
h 'jk/reading-packe
d
-refs'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
Hamano
Mer
g
e branch 'l
m
/
squ
e
lc
h
-
b
g-
p
r
o
gr
e
ss
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch
'jk/sha1-file-re
d
u
c
e-usele
s
s-w
a
rnings'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branc
h
'nd/multiple-wor
k
-
trees'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merge bran
c
h 'p
t
/c
r
edent
i
al-xdg'
commit
|
commitdiff
|
tree
2015-05-11
M
ichael
Haggerty
reflog_expire(): integrate lock_ref_s
h
a1_ba
s
ic() errors
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michael
Haggerty
ref_transaction_c
o
mm
i
t():
delete extra
"
th
e
" fr
o
m error
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mich
a
el Haggerty
r
e
f_tran
s
action
_
commit(): provide better error message
s
commit
|
commitdiff
|
tree
2015-05-11
Micha
e
l Ha
g
gerty
r
e
name_ref(): integr
a
te
loc
k
_ref_sha1_basi
c
()
error
s
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
M
ichael Hagg
e
rty
lock_ref_
s
h
a1
_
basic(
)
: improve diagnostics for ref
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
M
i
ch
a
el Hagger
t
y
lock_ref_sha1_basic():
r
e
p
o
rt erro
r
s
v
ia
a
"
struct
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mic
h
a
e
l Haggerty
v
e
rify_refname_available(): report errors via a "struct
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mich
a
e
l Haggerty
v
eri
f
y
_
refname_available(): rename function
commit
|
commitdiff
|
tree
2015-05-11
Mich
a
e
l
Hag
g
erty
refs: check for D/F conflicts among refs cr
e
ated
i
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mic
h
ael Haggerty
ref_transaction
_
commit(): use
a string_list
f
or detecting
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mi
c
hael Hagger
t
y
is_refname_available(): use dirname in first loop
commit
|
commitdiff
|
tree
2015-05-11
Michael Haggerty
struct no
n
mat
c
hi
n
g
_ref_d
a
ta
:
store a
r
efn
a
me ins
t
ead
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mi
c
hael Haggerty
report_refname_conflict
(
)
:
i
nline function
commit
|
commitdiff
|
tree
2015-05-11
Michael Haggerty
entr
y
_matches():
inline function
commit
|
commitdiff
|
tree
2015-05-11
Micha
e
l Hagg
e
rty
is
_
refname
_
available(
)
: co
n
v
ert local variable "dirname
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michael Haggerty
is_
r
efna
m
e
_
av
a
ilable
(
):
a
void sh
a
do
w
ing "d
i
r" variable
commit
|
commitdiff
|
tree
2015-05-11
Micha
e
l Haggerty
is_refname_available(): revamp t
h
e comm
e
nts
commit
|
commitdiff
|
tree
2015-05-11
Mi
c
hael Hagger
t
y
t1404: new tests of r
e
f D/F
co
n
fl
i
cts within trans
a
ctions
commit
|
commitdiff
|
tree
2015-05-11
Ste
f
an
B
eller
r
e
fs
.
c: remove
lock_fd from struct ref_lo
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-10
Stefan Beller
u
p
d
ate-ref: test ha
n
d
l
ing larg
e
transactio
n
s properl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-08
Sébas
t
i
e
n Gui
m
m
a
ra
command-lis
t
.
txt:
f
ix
w
hitespace inconsistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-08
D
anny
Lin
cont
r
ib/subtree: portab
i
li
t
y fix
f
or st
r
ing p
r
inting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-08
Lar
s
Kellogg-Stedman
http:
add s
u
pport for s
p
ecifying an SSL cipher lis
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-08
Patr
i
c
k
Stei
n
hardt
b
undle: ver
i
fy ar
g
uments more strict
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-07
Danny Lin
contrib/subtree: there's no push
-
-
squash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-07
Ju
n
io C Hamano
tests: sk
i
p dav http
-
push tests unde
r
NO_EXPAT=No
T
ha
n
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-07
Jeff
King
t/lib-httpd
.
sh: skip tests if NO_CUR
L
is defined
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
c
ompletion: remove cred
e
n
t
ial h
e
lpers from porcelain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Kart
h
ik N
a
yak
t1006: add
tests for git cat-file --allow-
u
nk
n
own-type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
K
a
rthik
N
ayak
cat-file:
t
each cat-
f
ile a '
-
-allow-unknown-
t
ype' 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
N
ayak
cat-file: ma
k
e
t
he option
s
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
Karthik Nayak
sha1_f
i
le
:
support reading from a loose
object of 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
Dan
n
y
L
in
br
a
nch: do no
t
ca
l
l a "remote
-
tracking branch" a "remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
T
a
n
pa
t
h
.
c: remove
h
o
me_config
_
p
a
th
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
P
au
l
Ta
n
git-conf
i
g
:
re
p
l
ace use of home_c
o
nfi
g
_paths()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-c
o
mmit: replac
e
use o
f
home_con
f
i
g_p
a
ths()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
crede
n
tial-sto
r
e
.
c
:
r
eplace home_
c
on
f
ig_p
a
t
hs() wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
u
l Tan
d
i
r
.
c: rep
l
a
ce home_conf
i
g_pa
t
hs() with xdg_config_home()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
T
an
attr
.
c: replace home
_
config_
p
a
ths() with xdg_config_home()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
Tan
path
.
c: im
p
lement xdg_confi
g
_
h
ome()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hama
n
o
F
irst batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
amano
Me
r
ge branch '
j
k
/prune-mti
m
e'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge bran
c
h 'mm/usage-log-l
-
can-take
-
regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Me
r
ge b
r
anc
h
'ep/
f
ix-test-lib-functions-rep
o
rt'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Merge branch '
c
n
/bom-in-gi
t
i
gno
r
e'
commit
|
commitdiff
|
tree
2015-05-06
J
uni
o
C Hamano
Merge branc
h
'jc/epochtime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'nd/t1509-chro
o
t-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e branch
'
oh/fix-co
n
fig-defa
u
lt-user-
n
ame-section'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
r
anch '
j
k/type-from
-
stri
n
g-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branc
h
'
s
b
/
test-bitmap
-
free-at-en
d
'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
Hamano
Mer
g
e branch 'ld/p4-filetype-de
t
ection'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge branc
h
'ts/check
o
ut-advice-plu
r
al'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Merge branch 'jk/init-core-w
o
rktree-at-
r
o
ot'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
am
a
no
Merge branch 'mh/show-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge branch 'sb/line-log-plug-p
a
irdiff-le
a
k'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge
bran
c
h
'jc/diff-no
-
i
n
dex-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
M
erge branch 'bc/objec
t
-id'
commit
|
commitdiff
|
tree
2015-05-05
Elia Pinto
git-compat-util
.
h: implem
e
nt a different ARRAY_SIZE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C H
a
mano
daemon: unbreak NO
_
IPV6 build regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
S
t
efan Beller
prefix_path(): uncondit
i
onally free results in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
write_s
h
a
1
_file(
)
:
d
o not use a separate sha
1
[
] a
r
r
ay
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
E
r
ic Sunshine
t1007: a
d
d
h
a
sh-ob
j
ect --literally tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Eric Sun
s
hi
n
e
hash-obje
c
t --l
i
terally:
f
i
x
b
u
ffer o
v
errun with extra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-04
J
o
nathan Nie
d
er
c
o
nfig:
u
se e
r
ror() instead of
fprint
f
(stderr,
.
.
.
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-04
Eric S
u
nshine
git
-
hash-obje
c
t
.
txt: document
-
-
literally
o
p
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
SZE
D
E
R
Gáb
o
r
c
ompletion:
f
ix and
update
'
git log --decorate=' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
SZEDER Gábor
c
omple
t
ion: remov
e
redund
a
n
t
__git_comp
u
te_all
_
comma
n
ds
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
Duy Nguyen
pathspec: avo
i
d the need of "--
"
when wildca
r
d is used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
Torst
e
n Bögersha
u
sen
blame: CRLF
i
n the working tree and L
F
in the re
p
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio
C
Hamano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
merge: deprecate 'git
merge
<
mess
a
ge> HEAD <
c
ommi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
uni
o
C Ham
a
no
merge: h
a
n
dle FETCH_HEAD interna
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge: decide if we auto-generat
e
the
message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
am
a
no
mer
g
e
:
make coll
e
ct_parent
s
() auto-
g
enerate the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Ha
m
ano
merg
e
: extract pre
p
are_mer
g
e_m
e
s
sage() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
mer
g
e: nar
r
ow scope
o
f merge_
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merg
e
: split
redu
c
e
_
paren
t
s() out o
f
col
l
e
ct_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: cl
a
r
i
fy
c
ollect
_
parents
(
) logi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: smal
l
leakfix
a
nd code simplificat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
merge: do not
c
h
e
c
k
a
rgc to de
t
ermine number of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge
:
clar
i
fy "p
u
ll
i
ng
int
o
void" s
p
e
cial
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520:
t
est pulling an oct
o
pus into an unb
o
rn bran
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
t5520
:
st
y
l
e fi
x
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C
H
amano
merge:
s
implify code flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge: test the
t
op
-
level merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Je
f
f
Ki
n
g
filter-br
a
nch:
a
void
pass
i
ng com
m
it mess
a
ge th
r
ough sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Phil H
o
rd
reba
s
e -i: redo tasks
that di
e
durin
g
c
h
e
rry-pi
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
e
ff King
test-lib: turn
o
n GIT_TEST_CH
A
I
N
_LINT by d
e
fa
u
l
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
R
a
msay J
o
nes
t
7502-co
m
mi
t
.
s
h
: fix
a
b
roken and-chain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next