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 'da/mergetool-meld'
2014-10-21
J
unio C
H
ama
n
o
Mer
g
e branch 'da/m
e
rgetool-meld'
commit
|
commitdiff
|
tree
2014-10-21
J
u
nio C Hamano
Merge branch
'da/merge
t
ool-temporary-directory
'
commit
|
commitdiff
|
tree
2014-10-21
J
u
n
i
o
C Hamano
Merge
b
r
a
nch 'da/merge
t
o
o
l
-
tool-he
l
p
'
commit
|
commitdiff
|
tree
2014-10-21
Junio
C Hamano
Merge bran
c
h 'da/
m
erge
t
ool-temporary-fil
e
name'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
M
e
rge
branch 'da
/
mergetool-tests'
commit
|
commitdiff
|
tree
2014-10-21
Ju
n
i
o C Hamano
Merge branc
h
'rs
/
ref-transactio
n
'
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C Haman
o
Update d
r
aft rel
e
ase notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C Ha
m
a
n
o
Me
r
ge branch 'cc/i
n
terpr
e
t-trailers'
commit
|
commitdiff
|
tree
2014-10-20
J
uni
o
C
Haman
o
Merge
b
ran
c
h
'
r
m/gitweb-
s
tart-for
m
'
commit
|
commitdiff
|
tree
2014-10-20
J
un
i
o C
H
a
ma
n
o
Merge branch 's
s
/contrib-subtree-
c
o
n
tacts'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C
Hamano
Me
r
g
e
bra
n
c
h
'jn/parse-con
f
i
g
-sl
o
t'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge branch 'rs/recei
v
e-p
a
ck-argv-leak-fix'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
M
erg
e
branch 't
a
/config-se
t
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C
Hamano
M
e
rge
b
r
a
nch 'jk/test-shell-trace'
commit
|
commitdiff
|
tree
2014-10-20
Junio C
H
amano
Merg
e
branc
h
'bc/asc
i
idoc'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C
Hamano
Reve
r
t
"archive:
h
onor tar
.
umask even for p
a
x
h
eaders"
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
Me
r
ge branch 'jc/
c
ompletion
-
no-chdir'
commit
|
commitdiff
|
tree
2014-10-16
Juni
o
C Ha
m
ano
Merge branch '
b
w
/
trace-no-inline-
g
etnanotime'
commit
|
commitdiff
|
tree
2014-10-16
Jun
i
o C Hamano
Mer
g
e branc
h
'
po/ever
y
day-doc
'
commit
|
commitdiff
|
tree
2014-10-16
Roland
Mas
gitw
e
b: use
start_f
o
rm, not startform that wa
s
remo
v
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mer
g
etool: add test
c
ases
for
m
e
r
g
etool
.
wri
t
e
T
oTem
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid
A
g
u
ilar
mergeto
o
l: add an option
for writing to a tempo
r
ary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
mergetool: use more con
s
ervative temporary filena
m
es
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
i
d Ag
u
ilar
t
est-lib-function
s
: adjust st
y
le t
o
match CodingGuid
e
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610
-
mergetool:
u
se
test_config to isolate
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
merge
t
ools
/
m
e
ld: make
u
sag
e
of `--output` configurab
l
e
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Sch
u
berth
c
o
ntact
s
: add
a Makefi
l
e to generate
d
o
cs a
n
d install
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebas
t
ian Schuberth
subtree: add an i
n
stall-
h
tml target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Char
l
es Bailey
di
f
ftool: don't
a
ss
u
me that default sh
i
s sane
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Cha
r
l
e
s Ba
i
l
ey
mergetool: don't require a
work
tree f
o
r
--tool-help
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
g
it-sh-setup:
move GIT_DIR initializatio
n
into a function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Agu
i
lar
mergetool:
us
e
more conservative temporary filenames
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Agu
i
lar
te
s
t-
l
ib-functions: adj
u
st
s
tyle
to m
a
tch
CodingGuidelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
ar
t76
1
0-mergetool: pr
e
fer test_co
n
fi
g
over git confi
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
i
l
a
r
t7610-mergetool:
a
dd
mi
s
sing
&
& and remove com
m
ented
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
i
d Ag
u
ilar
t7610-mergetool: use tabs inste
a
d of a mix of tabs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
onathan Niede
r
ref_transaction_com
m
it: bail out
o
n
failure to
re
m
ove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
loc
k
file: rem
o
v
e unable_to_
l
o
c
k
_
erro
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonat
h
an Nieder
re
f
s
.
c: do not permit err == NUL
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahl
b
erg
remote rm/prune: pri
n
t
a message when
w
r
iting
p
a
c
ked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
for-each-ref: skip an
d
wa
r
n abo
u
t broke
n
ref name
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
r
efs
.
c
:
allow listin
g
and deleti
n
g bad
l
y named refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hl
b
erg
t
est: put tests for
h
and
l
ing of b
a
d ref names in one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
o
nathan
N
ieder
packed-ref cache
:
forbi
d
dot-components
in refnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
branch -d
:
s
i
mp
l
i
f
y by using RES
O
LVE_REF_READIN
G
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan
Nied
e
r
branc
h
-d: a
v
oid
r
e
p
eated symref resolu
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Junio C Hamano
re
f
log t
e
st: test
inter
a
ction
with det
a
ched HE
A
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
re
f
s
.
c: change res
o
l
v
e_r
e
f_un
s
afe
r
eading argument
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahlberg
refs
.
c: make write_ref_sha1 static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
a
h
lberg
fetch
.
c: cha
n
ge s_updat
e
_ref t
o
use a
ref trans
a
ctio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie
Sahlberg
re
f
s
.
c
:
r
e
f
_transac
t
ion_comm
i
t: distinguish name c
o
nflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lberg
refs
.
c:
pass a list of
names to skip to is
_
refname_availa
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
refs
.
c
:
ca
l
l lock_r
e
f
_sha1_ba
s
i
c direc
t
l
y from
commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlber
g
ref
s
.
c:
r
ef
u
se to lock ba
d
ly
named refs in lock
_
ref_sh
a
1
_
basi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahlberg
rename
_
r
e
f
:
don't ask read
_
ref_full where the
r
ef
came
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c:
pas
s
the ref log
messag
e
t
o _create/dele
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c: ad
d
a
n er
r
argument to d
e
lete
_
re
f
_
loose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahlberg
wr
a
pper
.
c: add
a new funct
i
on unlin
k
_or_
m
s
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c
: lock_ref_sha1_
b
asic is used f
o
r all
refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lberg
w
ra
p
pe
r
.
c: remove/unli
n
k_or_warn: simplify, treat ENOENT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
mv test: recr
e
ate mod/ directory ins
t
e
ad of
r
elying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jeff King
color_parse: do not men
t
ion v
a
r
i
ab
l
e name in erro
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jonathan Nie
d
e
r
pass conf
i
g
s
lots
as poin
t
e
rs instead of
offsets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Update dra
f
t relea
s
e
n
ote
s
to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch
'
bc/asciidoc-pretty-formats-
f
ix'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
e
rge
b
r
an
c
h 'rs/plug-leak-
i
n-bundle
'
commit
|
commitdiff
|
tree
2014-10-14
J
uni
o
C Hamano
Merg
e
b
ranch 'rs/m
o
re-
u
ses-of-ski
p
-prefix'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branc
h
'rs
/
mailsplit'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io C Hamano
Merge br
a
nch 'rs/sha1-array
-
test'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Haman
o
Me
r
ge branch 'mh/lockfile-stdio'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
erge bran
c
h 'mh/lockfile'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
erge
b
ranch 'sk/tag-contains-wo-recursi
o
n'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hama
n
o
Me
r
ge branc
h
'
da/comple
t
ion-sh
o
w-s
i
gna
t
ure'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Ham
a
no
Merge
bran
c
h 'rs/daemon
-
fixes'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch '
d
t/ca
c
h
e
-tree-repair'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
H
a
mano
Mer
g
e
b
r
anch 'so/r
e
b
a
se-
d
oc-fork-point
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
Hama
n
o
Merge b
r
anch 'da/include-c
o
m
pat-util-first-i
n
-c'
commit
|
commitdiff
|
tree
2014-10-13
Jeff
Ki
n
g
test-lib
.
sh: support -x
o
ption f
o
r
shell-tra
c
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
J
u
nio C Hamano
t1308: fix
b
r
oken he
r
e
document in test script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
is
t
ian Couder
D
o
cumentation: ad
d
docume
n
t
a
tion f
o
r
'gi
t
interp
r
e
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
h
r
istian Couder
t
r
ailer: add tests for commands in con
f
ig file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ris
t
i
a
n Couder
t
railer: execute command
f
rom 'tr
a
iler
.
<na
m
e>
.
com
m
a
n
d'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
uder
traile
r
: add tests f
o
r "git interpret-trailers"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an Cou
d
er
t
r
a
i
ler: add
i
nterpret-trailer
s
comma
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
hris
t
ia
n
Coude
r
trai
l
er: put al
l
th
e
pro
c
essing t
o
ge
t
her and print
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
hri
s
tian Coud
e
r
trailer: parse trailers from file or s
t
din
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
t
i
an Couder
tra
i
le
r
: proce
s
s
comma
n
d line
trailer arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
s
t
ian
Coud
e
r
tra
i
ler: read and proce
s
s c
o
n
fig informatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an Couder
t
r
ailer:
p
ro
c
ess t
r
ailers from in
p
ut message
a
nd ar
g
um
e
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: ad
d
data structu
r
e
s and ba
s
i
c fu
n
c
t
ion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
c
a
rlson
Documentatio
n
: fix mismat
c
hed del
i
miters in g
i
t
-imap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
b
r
ian m
.
carlson
Do
c
umentation:
a
d
just d
o
cumen
t
title under
l
ining
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
René Scha
r
fe
receive-pack: plug m
i
nor me
m
o
ry leak in unpack
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Jef
f
King
t
5
304: use
h
elper
to
r
eport
failure of "test foo
=
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
t5304
:
us
e
test_path_is_* instead
o
f "
t
es
t
-f"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Phi
l
ip Oakley
doc: a
d
d
'eve
r
yday' to 'git help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Phili
p
Oakley
d
o
c: M
a
k
efile
regularis
e
OBSOLETE_HTML list
building
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Philip Oakley
doc
:
modernise
eve
r
yday
.
txt wording
an
d
f
ormat in man
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-09
Junio
C
H
aman
o
completion: use "g
i
t
-C $there" instea
d
of (cd
$there
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-08
b
ria
n
m
.
ca
r
lson
Docume
n
t
a
tion:
fix
misrender of
p
retty-forma
t
s
i
n Asciidoctor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next