repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Update draft release notes to 2.2
2014-10-21
Ju
n
io
C
H
a
mano
Update
dra
f
t release notes
to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge
b
ran
c
h 'js/comple
t
ion-hide-not-a-repo'
commit
|
commitdiff
|
tree
2014-10-21
Jun
i
o C Hamano
Mer
g
e br
a
nch 'da/mergetoo
l
-meld'
commit
|
commitdiff
|
tree
2014-10-21
J
u
n
i
o
C
Hamano
Merge branch 'da/m
e
rgetool-
t
e
m
porary-directory'
commit
|
commitdiff
|
tree
2014-10-21
J
un
i
o C Hamano
M
erg
e
bran
c
h 'da
/
mergetool-tool
-
help'
commit
|
commitdiff
|
tree
2014-10-21
Junio C H
a
m
ano
Merge
branch '
d
a/mergetool-te
m
porary-filename
'
commit
|
commitdiff
|
tree
2014-10-21
Junio
C
Hamano
Merg
e
branch 'da/mer
g
etool-tests'
commit
|
commitdiff
|
tree
2014-10-21
J
un
i
o
C
Ham
a
no
Merge branch 'r
s
/ref-transacti
o
n'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
U
p
dat
e
draft
release notes to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge branc
h
'cc/
i
n
terpret-t
r
a
i
lers'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Ha
m
an
o
M
erge branch 'r
m
/gi
t
web-start-form'
commit
|
commitdiff
|
tree
2014-10-20
J
unio C
H
amano
Merge branch 'ss
/
c
ont
r
ib-subtree-contacts
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge bra
n
ch '
j
n
/
parse-config-slot
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merg
e
bra
n
ch 'rs/receive-pack-argv-leak-fix
'
commit
|
commitdiff
|
tree
2014-10-20
J
u
n
io C H
a
m
a
no
Merge branch
'ta/config-se
t
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge
b
ranch 'jk/
t
est-shell-trace'
commit
|
commitdiff
|
tree
2014-10-20
Ju
n
io
C
Hamano
M
erge
branch
'bc
/
asciidoc'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Revert "
a
rchive: honor tar
.
umask e
v
en for pax heade
r
s"
commit
|
commitdiff
|
tree
2014-10-16
Ju
n
i
o C Haman
o
Merge branc
h
'jc/compl
e
tion-no-ch
d
ir'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Ha
m
ano
Merge
branch
'
b
w/trace-no-inline-getna
n
otime'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
Me
r
ge
branch 'po/eve
r
yda
y
-do
c
'
commit
|
commitdiff
|
tree
2014-10-16
Rolan
d
Ma
s
gitweb: us
e
start
_
f
o
rm, not startform
t
hat w
a
s removed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-m
e
rgetool: ad
d
test
c
a
ses
f
o
r
merge
t
o
ol
.
writeToTemp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
mergetool: a
d
d an op
t
ion
f
o
r
w
riting to a tempor
a
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
merget
o
ol: us
e
more conservat
i
ve temporary filenames
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguil
a
r
test-lib-functions:
adjust style to
m
atch C
o
dingGuidelines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
t
761
0
-mergetool: use tes
t
_
con
f
i
g
to i
s
olate
t
e
s
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools
/
m
el
d
: make usage o
f
`--outpu
t
` configurable
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Seba
s
tian Schu
b
e
rth
con
t
a
c
ts: add a
Makefi
l
e to generate d
o
cs
and
install
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
S
e
bastian Schuberth
su
b
tree:
add
a
n install-ht
m
l target
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Charles
B
ailey
diff
t
o
o
l: d
o
n't ass
u
m
e that def
a
ult sh is
s
a
ne
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
C
h
arles
B
a
iley
mergetool: don't require a
w
ork tre
e
fo
r
-
-
t
o
ol-help
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ila
r
git-sh-setup: move GIT_DIR in
i
ti
a
lization into a function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Ag
u
ilar
mergetool
:
u
se mor
e
conse
r
va
t
ive
t
e
mp
o
rary
filenames
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
test-lib-fu
n
ctions: adjust sty
l
e
to match Co
d
ingGuidel
i
nes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t7610-mergetool: prefe
r
te
s
t_config over git config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7
6
10-mergeto
o
l: add mi
s
sin
g
&& an
d
remove co
m
mented
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
ar
t76
1
0
-merget
o
ol: use
t
abs ins
t
ead
o
f a mix of tabs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
ref_t
r
a
n
saction
_
c
o
m
mit
:
ba
i
l out on failure to
r
e
move
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonatha
n
Nieder
lockfile: re
m
ove
unable_to_lock_error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
refs
.
c:
do
n
ot permit err
== NULL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lberg
remote rm/prune: prin
t
a message when
w
r
i
t
i
n
g packed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
n
n
i
e Sahlberg
for-each-ref:
s
kip and warn about
broke
n
ref names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
on
n
ie Sahlberg
refs
.
c:
a
l
low
l
is
t
i
n
g and dele
t
ing badly named re
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie
S
a
h
lberg
t
e
st: put t
e
sts fo
r
ha
n
dling
o
f b
a
d r
e
f names in one
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonatha
n
Nieder
pa
c
ked-re
f
cache: forbid dot-compon
e
nts
in refnames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
on
n
i
e
Sa
h
lberg
b
ranch -d: s
i
mp
l
ify by
using RESO
L
V
E
_REF
_
READING
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nied
e
r
branch
-d:
avoid repeated symr
e
f res
o
lution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
J
u
n
io C Ha
m
an
o
reflog
t
e
st: test interactio
n
with det
a
ched
H
E
AD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
r
e
fs
.
c: change resolve_re
f
_uns
a
f
e reading arg
u
ment
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlbe
r
g
refs
.
c: m
a
ke write_ref_sha1 static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
fetch
.
c: change
s_update_re
f
to use a ref transacti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lberg
refs
.
c
:
ref_transaction_commit: distinguish na
m
e c
o
nflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahl
b
e
r
g
refs
.
c: pa
s
s a list of names to skip to is_refname_available
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
S
ahl
b
erg
refs
.
c: call loc
k
_ref_sha
1
_basic di
r
ectly fr
o
m commi
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c: refuse to
l
o
c
k b
a
dly na
m
ed ref
s
in lock_ref_sha1_basi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
on
n
i
e
Sahlbe
r
g
rename_ref:
d
o
n't ask
read_r
e
f_full w
h
ere
the re
f
came
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahlb
e
rg
refs
.
c: pas
s
t
h
e ref log
message to _cr
e
ate
/
dele
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlb
e
r
g
refs
.
c: add a
n
err argument to del
e
te_ref_loose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
b
erg
wrapper
.
c: add a
n
e
w
fu
n
ction
u
nlink_or_msg
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlb
e
rg
ref
s
.
c: lock_r
e
f_s
h
a1_basic is used f
o
r all refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hl
b
erg
wrap
p
er
.
c:
remo
v
e/unlink_or_warn: simplify,
t
r
e
at E
N
OENT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Ni
e
der
mv test: recreate mod/ directory instea
d
of r
e
lying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
J
oh
n
Szakmei
s
ter
co
m
p
l
etion: sil
e
n
c
e "fat
a
l:
N
ot a
g
it re
p
ository"
e
rror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Je
f
f K
i
n
g
co
l
or_pa
r
se:
do not ment
i
o
n
variable na
m
e in error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jonat
h
an Ni
e
der
pas
s
config slots a
s
pointers instead
o
f
o
ffsets
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Junio C H
a
mano
Updat
e
draft release no
t
e
s t
o
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Ham
a
no
Merge branch 'bc/
a
s
c
iidoc-
p
ret
t
y-formats-fix'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Hamano
Merge br
a
n
c
h 'rs/p
l
ug-lea
k
-in-bundl
e
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
e
rge branch 'rs/more-u
s
e
s-of-skip-prefix'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C
Hamano
Merge br
a
nch 'r
s
/mailspl
i
t'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
e
rge branch 'rs/sha1-ar
r
ay-test'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C Hamano
Merge bran
c
h 'mh/lockfile-
s
t
d
io'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'mh/lockfile'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge b
r
anch 'sk
/
tag-contains-wo-recursion'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
Hamano
Merge branch 'da/compl
e
tion-
s
ho
w
-signat
u
re'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'rs/daemon-fixes'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C Haman
o
Merge branch
'dt/cache-tree-repair'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C Ha
m
a
no
Merge
b
ranch 'so/rebase-doc-fo
r
k-po
i
nt'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C Hama
n
o
Merge
b
ranch 'da/include-compat-util-f
i
r
s
t-in-c'
commit
|
commitdiff
|
tree
2014-10-13
Jeff
K
in
g
test-lib
.
sh
:
support -x option for s
h
e
ll
-
t
racing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Juni
o
C
Hamano
t1308: f
i
x broken here document in
test script
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
Documentation: add
documentat
i
on for 'git inte
r
pret
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: add tests for commands in config fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer:
e
xecute command from 'trailer
.
<name
>
.
comma
n
d'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian
C
ouder
traile
r
: add tes
t
s for "git interpret-trailers"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n C
o
u
d
e
r
tr
a
iler: ad
d
interpret
-
trailers command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n Couder
trai
l
er: put all th
e
proce
s
sing
together and print
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
C
h
r
ist
i
a
n
Coud
e
r
trailer: parse trailers
from file or stdin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
istian Couder
tra
i
le
r
: process co
m
mand
l
i
ne
tr
a
ile
r
arg
u
ments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
C
hristian
C
ouder
trailer: re
a
d and process
c
onfig
information
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
C
h
rist
i
an Couder
tr
a
iler: process tr
a
ilers f
r
om
input mes
s
age and
a
rgume
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
ti
a
n Co
u
d
e
r
trailer
:
add data str
u
c
tur
e
s
a
nd b
a
s
i
c functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
carl
s
on
D
ocumentatio
n
: fix mismatched delimiters in git-i
m
ap
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
b
r
ian m
.
carlson
D
oc
u
m
entation:
a
djust
d
ocument title und
e
rlining
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
René S
c
h
a
rf
e
r
e
ceive-p
a
ck: plug
minor me
m
ory leak in unpack()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
t
5
304: use helper to report failure
o
f "test fo
o
=
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
t5304: use test_
p
a
th_is_* ins
t
e
a
d of "test
-
f"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-10
Philip
Oakley
doc:
add 'everyda
y
' to
'
git h
e
lp'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-10
Phil
i
p Oakley
doc:
M
ake
f
ile regularise OBSOLETE_HTML list bu
i
lding
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next