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
Junio C Ham
a
n
o
Merge
b
ranch '
d
a/mergetool-meld'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hama
n
o
Me
r
g
e branch 'da/me
r
getool-temporary-direct
o
r
y
'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge br
a
nch
'da/mergetool-to
o
l
-
help'
commit
|
commitdiff
|
tree
2014-10-21
Junio
C Hamano
Mer
g
e
branch 'd
a
/mergetool-temporary
-
f
i
lename'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge branch 'da
/
mergeto
o
l-
t
ests'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge
b
ranch
'
rs
/
ref-t
r
ansaction'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Ha
m
ano
Upda
t
e draft release notes t
o
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge branch
'
c
c/int
e
rpr
e
t-trailers'
commit
|
commitdiff
|
tree
2014-10-20
Ju
n
io C Hamano
Me
r
g
e
bra
n
ch 'r
m
/gitweb-star
t
-form'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merg
e
branch 'ss/cont
r
i
b
-subtree-contacts
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Haman
o
Mer
g
e branch 'jn
/
parse-config
-
s
l
ot'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge branch
'
rs/rec
e
ive-pack-argv
-
lea
k
-fix'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C Hamano
Merge branch 'ta/
c
onfig-set'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge branch 'jk/t
e
st-sh
e
ll-trace'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C Ham
a
no
Merge bra
n
ch 'bc/
a
s
c
i
idoc'
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C
H
am
a
n
o
Rever
t
"arc
h
ive
:
ho
n
o
r
tar
.
umask eve
n
for pax heade
r
s"
commit
|
commitdiff
|
tree
2014-10-16
Junio C H
a
mano
Merge bra
n
ch 'j
c
/completi
o
n
-no-chdir'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
M
e
rge bra
n
ch 'bw/trace-no-i
n
line-getnan
o
t
i
m
e'
commit
|
commitdiff
|
tree
2014-10-16
Juni
o
C H
a
mano
Merge
b
r
anch 'po
/
ev
e
ryday-doc'
commit
|
commitdiff
|
tree
2014-10-16
Roland
M
as
gitweb: use sta
r
t
_
fo
r
m
,
not
startf
o
rm th
a
t was removed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
i
d
Agu
i
la
r
t7610-merget
o
ol: a
d
d
t
es
t
ca
s
e
s for merge
t
oo
l
.
w
riteT
o
T
em
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool
:
add
a
n option for writing
to a temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
m
e
rgetool: use
m
o
r
e cons
e
r
v
ative 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
David Aguila
r
test-lib-f
u
nctions: ad
j
ust
style
t
o ma
t
ch Cod
i
ngGuidelines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
avid A
g
uilar
t
761
0
-mer
g
e
to
o
l: use test_config to i
s
ol
a
te tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
merge
t
o
o
ls/me
l
d
:
m
ake usa
g
e of
`--
o
ut
p
ut` conf
i
gurable
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Seb
a
stian
S
c
h
uberth
con
t
acts: add a Makefile
t
o
generate
d
ocs
a
n
d
in
s
tall
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Sebast
i
an Sc
h
ub
e
rth
subtree: add
an install-ht
m
l targ
e
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
difftoo
l
:
d
on't assume
t
hat default sh is sane
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
C
harles Bail
e
y
mergetool: don't
r
equire a work tree
f
or --tool-help
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
git-
s
h-s
e
tup: move GIT_DI
R
init
i
alization into a functio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
merge
t
ool:
use m
o
r
e c
o
nservative t
e
mporary fi
l
enames
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-
l
ib
-
f
u
n
ctions: a
d
just sty
l
e to ma
t
c
h
CodingGuidelines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
t7610-
m
erg
e
tool
:
prefer test_config
over g
i
t
c
onf
i
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
t
7
610-mergetool: add missing && and r
e
m
o
v
e comment
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t76
1
0-mergetool: use tabs
i
nstead
o
f
a mix of tabs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
J
o
nathan Nieder
ref
_
transaction
_
commit: bail out on failur
e
to remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan
N
ied
e
r
lockf
i
le:
r
e
m
ove unable_t
o
_lock_error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
J
o
nat
h
an
N
i
eder
refs
.
c: do not permit err == NU
L
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
remo
t
e rm/prune: pr
i
nt a message wh
e
n
writing packed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie S
a
h
l
berg
for-each-ref: skip and warn about broken ref names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
re
f
s
.
c: allow listing and de
l
eting badly named refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sahlberg
test
:
p
u
t tests for handling of
ba
d
re
f
names in one
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
packed-ref
c
ache: forbid dot-
c
omponents in refnames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nn
i
e
S
a
hlberg
bra
n
c
h -d:
simplif
y
by usin
g
RESOLVE_REF_READING
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan N
i
eder
branch -d: avoid rep
e
ated s
y
m
r
e
f resoluti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Junio C Hamano
reflog te
s
t: test interaction with d
e
ta
c
hed HEAD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahlberg
refs
.
c: change resolve_ref_unsafe reading argument
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c:
make write_
r
e
f
_sha
1
stati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
fetch
.
c
:
change
s
_update_ref
t
o use a ref
t
r
ansact
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c:
ref_
t
ransaction_
c
ommit: distinguish
name
c
onfli
c
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c: pass a li
s
t of names to skip to is_refn
a
me_available
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sah
l
berg
re
f
s
.
c
:
c
all l
o
ck_
r
ef_s
h
a
1_b
a
si
c
dire
c
tly from commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahlberg
refs
.
c: r
e
f
u
se to lock badly named
r
efs in
l
o
c
k
_ref_sha1_basic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sahlber
g
rename_ref
:
don'
t
ask
r
ea
d
_ref_full where
the ref came
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sahlberg
refs
.
c
:
pass the re
f
log messa
g
e to _create/
d
e
le
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c
:
add an er
r
ar
g
ument to dele
t
e_r
e
f_l
o
ose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie
Sahlberg
wrapper
.
c
: add a new functio
n
unlink_or_m
s
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
ah
l
berg
re
f
s
.
c
: lo
c
k_ref_sha1_basic is used fo
r
al
l
refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sahl
b
erg
wrapper
.
c: remov
e
/
u
nlink_or_w
a
rn: simplif
y
, treat EN
O
ENT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan N
i
ed
e
r
mv test: recrea
t
e mo
d
/ director
y
instead
o
f
relying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jeff King
color_pars
e
: do not mention
variable name
i
n err
o
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jonathan Nied
e
r
pass confi
g
s
lots as
pointers instead
o
f offsets
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Ha
m
ano
Update draft re
l
ease 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 Hamano
Merge bra
n
ch 'bc/asciidoc-pretty-f
o
rma
t
s-fix'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C Ha
m
ano
M
e
r
ge branch '
r
s/plu
g
-
l
ea
k
-in-bund
l
e
'
commit
|
commitdiff
|
tree
2014-10-14
J
u
ni
o
C
H
amano
Merge bra
n
ch 'rs/
m
ore-uses-of-skip-prefi
x
'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C Ha
m
ano
Mer
g
e branch 'rs
/
mail
s
plit'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Mer
g
e
branch 'rs/
s
h
a1-array-t
e
s
t
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C H
a
mano
Merge
branch 'mh/l
o
ckfil
e
-stdio'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hama
n
o
Merge bran
c
h 'mh/lock
f
ile
'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o
C Hamano
Merge branch 'sk/ta
g
-contains
-
wo-recursion'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merg
e
branch 'da/completion-show-sig
n
ature'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C Hamano
M
e
rge branch 'rs/daemon-fixes'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge br
a
n
c
h
'dt/cache-tr
e
e-repa
i
r'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
Hamano
Merge bra
n
ch 'so/re
b
ase-
d
oc
-
fork-poin
t
'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C Ham
a
no
Merge bran
c
h
'da
/
i
n
c
l
u
de
-
compat-util
-
firs
t
-
i
n
-c
'
commit
|
commitdiff
|
tree
2014-10-13
Jeff Kin
g
test-lib
.
sh
:
su
p
port -
x
opt
i
on fo
r
s
h
ell
-
tracing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Ju
n
io C Hamano
t1308
:
f
i
x
broken here docume
n
t in test script
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian Coud
e
r
D
oc
u
menta
t
ion:
add documentation for
'git interpret
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian Couder
trai
l
er:
add
te
s
ts for comm
a
nds in
co
n
fig f
i
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristia
n
Couder
trailer: execute comman
d
from '
t
railer
.
<name>
.
command'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
t
i
an Couder
t
ra
i
ler: add tests for "git interp
r
et-
t
railers"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Coud
e
r
traile
r
:
add in
t
erpret-traile
r
s
c
ommand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n
Couder
trail
e
r: put all
t
h
e processing together and print
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Co
u
der
trailer: pars
e
trailers fro
m
f
i
le or std
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an
C
ouder
t
railer: proce
s
s command line trailer arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
i
stia
n
Couder
trailer:
re
a
d and process config information
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an Couder
trailer: process trailers
from input mes
s
age
and arg
u
men
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
uder
traile
r
: add d
a
ta structure
s
and basic functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
b
ri
a
n m
.
carl
s
on
D
o
cumenta
t
i
on
:
fix mismatche
d
del
i
miter
s
in git-imap
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
b
r
ian
m
.
carlson
D
ocumentatio
n
:
adjust doc
u
ment title underlin
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Re
n
é
Scharfe
receiv
e
-pa
c
k: plug m
i
n
or memo
r
y leak in u
n
pa
c
k
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
t5304: use helper t
o
report
f
a
ilure of
"test foo =
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Jeff Ki
n
g
t5304:
use test_pa
t
h_is_*
ins
t
ead o
f
"test -f"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-10
P
h
il
i
p Oakley
doc: add
'ev
e
r
y
day' to 'git help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-10
Phi
l
ip Oakley
doc: Makef
i
l
e regula
r
ise OB
S
OLETE_HTML li
s
t 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 Oa
k
l
ey
doc: modernis
e
everyday
.
t
x
t wo
r
ding and format
i
n 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 Hamano
completion: use "git -C
$there" instead
of
(
cd $there
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-08
brian m
.
carlson
D
ocu
m
e
n
tation: fix m
i
srender
of pretty-format
s
in Asciid
o
ctor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next