repo.or.cz
/
git
/
mjg.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 Hamano
M
e
rge b
r
anch
'
da/mergetoo
l
-meld'
commit
|
commitdiff
|
tree
2014-10-21
Jun
i
o C H
a
mano
Merg
e
bra
n
ch 'da/mergetool-temporary-
d
ire
c
t
o
ry'
commit
|
commitdiff
|
tree
2014-10-21
Junio C
H
amano
Merge branch 'da/m
e
rg
e
too
l
-tool-help'
commit
|
commitdiff
|
tree
2014-10-21
Jun
i
o C H
a
m
ano
M
erge
b
ranch 'da/mergetool-
t
emporar
y
-fil
e
na
m
e'
commit
|
commitdiff
|
tree
2014-10-21
J
u
nio C
Hamano
M
e
r
g
e branch 'da/mer
g
etool
-
tests'
commit
|
commitdiff
|
tree
2014-10-21
Junio C H
a
man
o
Merg
e
branch 'rs/ref-t
r
a
nsaction'
commit
|
commitdiff
|
tree
2014-10-20
J
unio C Hamano
Up
d
ate dra
f
t re
l
ease notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Junio C
Hamano
M
e
rg
e
b
r
anch '
c
c
/
i
nterpret-trailer
s
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hama
n
o
Merge
b
ranch 'rm/gitw
e
b-sta
r
t-form'
commit
|
commitdiff
|
tree
2014-10-20
Juni
o
C Ham
a
n
o
Merge branch 'ss/co
n
trib-subtree-
c
o
ntact
s
'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C
Haman
o
Merge branch 'j
n
/parse-co
n
fig-
s
lot'
commit
|
commitdiff
|
tree
2014-10-20
J
u
ni
o
C H
a
mano
Merge
branch 'rs/r
e
c
e
ive-pa
c
k-argv-le
a
k-fix'
commit
|
commitdiff
|
tree
2014-10-20
J
unio
C
H
a
m
ano
Mer
g
e branch 'ta/config-set'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C
Hamano
Merge branch 'jk/tes
t
-shell-
t
race'
commit
|
commitdiff
|
tree
2014-10-20
J
unio C Ha
m
a
no
Merge
b
r
a
nch '
b
c/asc
i
idoc
'
commit
|
commitdiff
|
tree
2014-10-20
J
unio C
H
amano
Reve
r
t "archive
:
h
o
nor ta
r
.
umas
k
ev
e
n for pax headers
"
commit
|
commitdiff
|
tree
2014-10-16
Junio C
Hamano
Merg
e
b
r
an
c
h '
j
c/comple
t
ion-no-
c
hd
i
r'
commit
|
commitdiff
|
tree
2014-10-16
J
u
ni
o
C Hamano
Merge br
a
nch 'bw/trace-no-inline-getn
a
notime'
commit
|
commitdiff
|
tree
2014-10-16
Junio
C
Hamano
Merge br
a
nch 'po/everyday-
d
oc'
commit
|
commitdiff
|
tree
2014-10-16
Roland Mas
g
i
tweb: use start_for
m
, not startform that
w
as re
m
o
ved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
av
i
d Agu
i
lar
t
7610-
m
e
r
ge
t
ool:
a
d
d
test cas
e
s
for merg
e
tool
.
writeTo
T
emp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
me
r
getool:
add
an option for writing to a temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
id Aguilar
merg
e
tool: use more c
o
nserv
a
ti
v
e 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 Aguilar
t
e
st-
l
ib-
f
u
n
ctions: adjust style to m
a
t
ch
CodingGuidelin
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid A
g
ui
l
ar
t
7610-mergetool: use test_config to isolate tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
m
erge
t
ools/meld: make us
a
ge of `--output` confi
g
urable
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
S
e
b
a
stian Schuberth
c
o
ntacts: add a Ma
k
efile to gener
a
te docs and
inst
a
ll
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Schube
r
th
subtree
:
add
an
i
ns
t
a
l
l
-html target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Charl
e
s Bailey
d
i
ff
t
ool: don't a
s
sume that default sh is sane
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
m
e
rgetool: don't require a work t
r
ee for
--tool-help
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguila
r
git-sh-setup: move G
I
T_D
I
R initialization i
n
t
o
a
f
unction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
m
erg
e
tool: us
e
m
ore c
o
nservative
te
m
porary filenam
e
s
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
test-lib-functi
o
ns:
adjust
s
tyle to
m
atch CodingGu
i
delines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7610-mergetool: prefer test_config o
v
er
git conf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
ar
t761
0
-
merge
t
ool:
a
dd mis
s
ing && and
r
emove
c
ommented
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
t7610-merget
o
o
l: use tabs instead of a mix of ta
b
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jona
t
h
an
N
ieder
r
ef_transact
i
on_c
o
mmit: bail out on
failur
e
to r
e
move
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
o
n
athan Nied
e
r
l
ockf
i
le: remove
u
nable_to_lock
_
error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
r
e
f
s
.
c:
do
not permit err ==
NULL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
ahlberg
remote
rm/prun
e
:
print a
m
essage whe
n
writing pack
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
for-e
a
ch-ref: skip and warn about broken ref names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie Sah
l
berg
refs
.
c: allow
l
isting
and dele
t
i
ng badl
y
named refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
test: put tests for
handling of
bad ref names i
n
one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonath
a
n Nieder
packed-re
f
cache: forbid
d
ot-
c
ompon
e
nt
s
in refnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
h
lberg
br
a
n
ch -d:
simplify by using RESOLV
E
_RE
F
_READING
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonath
a
n
N
ieder
b
ranch -d: av
o
id repe
a
t
ed symre
f
resoluti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Junio C H
a
mano
reflog test: test interaction with detached HEA
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
r
efs
.
c: change resolve_
r
ef_unsafe reading a
r
gument
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sahlberg
re
f
s
.
c: make
w
rit
e
_r
e
f_sha1
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sahlberg
fetch
.
c: c
h
a
n
ge s_update_ref to use a
r
ef
t
ransaction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c: re
f
_
t
r
ansaction_commit: distinguish
name co
n
flicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sah
l
berg
ref
s
.
c: p
a
ss a li
s
t of nam
e
s to skip to is_refname_availa
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
berg
refs
.
c: call lock_
r
ef_sha1_basic direct
l
y from commi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahlberg
refs
.
c: refuse to lock badly named r
e
fs in lock
_
ref_sha1
_
bas
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nn
i
e S
a
hlberg
rename
_
ref:
d
on
'
t ask read_ref_fu
l
l wh
e
re the ref came
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
re
f
s
.
c: pass
t
he
r
ef log
m
essage to _cr
e
ate/delete
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lb
e
rg
refs
.
c: add
an er
r
argument to d
e
lete_ref_loos
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie Sahlber
g
wrapper
.
c:
add a
n
e
w
fun
c
t
ion unlink_or_m
s
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lberg
refs
.
c
:
l
oc
k
_ref_sh
a
1_basic
i
s used f
o
r
al
l
refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
wrapper
.
c
:
r
em
o
ve/unli
n
k_or_warn: simplify
,
treat ENOENT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Niede
r
mv test: recrea
t
e mod/ dir
e
ctory ins
t
ead of r
e
lyi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jeff King
color_parse: do not
m
ent
i
on v
a
riabl
e
name i
n
e
rr
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jonatha
n
N
i
e
der
pass c
o
nfig slots as pointers i
n
stea
d
of
o
ffsets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Update draf
t
release notes 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-fix'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch
'rs/plug-leak-in-bu
n
dle'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'rs/more-uses-of-skip-
p
refix'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Hamano
M
e
rge bra
n
ch 'rs/mailsplit'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C
Hamano
Merge branch 'rs/sha1-arra
y
-
test'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio
C
H
amano
Me
r
ge
b
r
anch 'mh/
l
ockfile
-
stdio'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Ham
a
no
M
e
r
ge branch 'mh/lockfile'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Hamano
Merge branch '
s
k
/tag-co
n
tai
n
s-wo-rec
u
rs
i
on'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
e
rge br
a
n
ch 'da
/
completion-show-s
i
gn
a
t
u
re'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C
H
ama
n
o
Merge branch 'rs
/
daemon-
f
ixes'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
H
amano
Merge br
a
nch
'dt/cache-tree-repair'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'so/rebase-doc-f
o
r
k
-point'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'd
a
/include
-
com
p
a
t
-util-fir
s
t-in-c
'
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
test-lib
.
sh: support
-
x
option
for shell
-
tra
c
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Junio C Hamano
t
1
308: f
i
x bro
k
e
n
her
e
d
oc
u
ment in
test
s
cript
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristia
n
Co
u
der
D
o
cumentation: add
d
ocument
a
ti
o
n
for 'git interpret
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: add tests fo
r
comm
a
nds
i
n config file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian
C
ou
d
er
trai
l
er: execute comma
n
d from 'tra
i
l
e
r
.
<name>
.
c
o
mmand'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Co
u
der
trailer: add
t
e
s
ts for "git in
t
erpret-tr
a
i
l
ers
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
tra
i
ler: add
interpret-tra
i
lers command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: pu
t
all the p
r
oc
e
ssing togethe
r
and pr
i
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
istian Co
u
d
er
trailer:
p
ar
s
e t
r
ailers from file
or stdin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: p
r
ocess com
m
and
line
trailer
a
rgu
m
en
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian
C
ouder
t
r
ailer
:
read
a
nd
process config informati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an C
o
ude
r
traile
r
:
p
rocess tra
i
lers from input message and arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: ad
d
data str
u
ctures
a
nd basic functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
brian
m
.
carlson
D
o
cumentat
i
on
:
fix mismatched delimiters in git-imap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
c
arlson
Docu
m
entation: adjust document ti
t
le underlining
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
René S
c
harf
e
r
e
ceive
-
pack: plu
g
minor
m
e
mo
r
y leak in unpack
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
J
eff King
t53
0
4: use helper to report fa
i
lure
of "test foo =
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
t5304:
use test_p
a
th_is_* instead
of "test -f"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Philip Oakley
doc: add 'everyday' to
'
git hel
p
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Philip Oakley
doc: Makef
i
le
r
egularise OBS
O
L
ET
E
_HTML li
s
t bui
l
ding
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Philip O
a
kley
doc
:
m
o
d
ernise everyday
.
txt wording and forma
t
in
m
a
n
.
.
.
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 $
t
her
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-08
b
r
i
an m
.
carlson
Documenta
t
i
on
:
fi
x
mis
r
end
e
r of prett
y
-formats in
Asciidoctor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next