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
Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
2014-04-19
Johan Herla
n
d
Git
2
.
0
:
g
it svn: Set de
f
ault --pre
f
i
x
='origin/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Joha
n
Herl
a
nd
note
s
: disallow r
e
using non-blob as
a
not
e
object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Johan Her
l
and
sha1_file
.
c:create_tmp
f
ile(): Fix r
a
ce
w
h
e
n creating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan He
r
land
g
i
t-svn
:
Warn abo
u
t changing default for --prefix i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan H
e
rland
Do
c
umenta
t
i
o
n
/
git
-
s
v
n
:
Promot
e
the u
s
e
of --prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Jo
h
an He
r
l
and
s
amp
l
e
pre-com
m
it hook: u
s
e --bool wh
e
n retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rland
t
3
200: Add test
demonstra
t
ing
m
i
nor
regressi
o
n
i
n 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
n
d
Ref
e
r to branch
.
<nam
e
>
.
remote/merge when
docum
e
n
t
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erlan
d
t3200: Minor fix when
p
reparing for
tracking fai
l
ure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t2024:
Fi
x
&&-chainin
g
and a couple of
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herlan
d
Move crea
t
e
_not
e
s_
c
o
mmit() f
r
om notes-m
e
rge
.
c in
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move copy_no
t
e
_for_rewrite + frie
n
d
s
from builtin/n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
finish_c
o
p
y
_notes_f
o
r_rewrite(): Let c
a
ller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glossary
:
Update and rephrase
t
he definition of a r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
a
n
Herland
branc
h
.
c
:
Validate tracking branch
e
s with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2: Don't use --track option
against "svn-rem
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herlan
d
t7201
.
24: Add
re
f
spec
to keep --track
working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t3200
.
39: tr
a
c
k
ing
s
etup should fail if
t
here is
n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
c
h
eckou
t
: Use remote refs
p
ecs when DWIMm
i
ng tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t20
2
4: S
h
o
w
failure to u
s
e refs
p
ec when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herla
n
d
t202
4
: Add te
s
t
s veri
f
ying current DWIM behavior
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n H
e
rl
a
nd
git symb
o
l
ic-ref -
-
delete
$
sym
r
ef
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
Fix
failure
to
d
elete a packed ref
t
hrough
a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
t1400-update-
r
ef: Add test v
e
r
ifying
b
ug with
symr
e
fs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herland
note
s
-
me
r
ge: Don't r
e
move
.
gi
t
/NOTES_
M
ERGE_WORKTR
E
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Herland
n
o
t
es-merge: use opend
i
r
/
readdi
r
i
nstead of using read
_
direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Herl
a
n
d
t3310: illustr
a
t
e
failure
t
o "not
e
s merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an
Herland
fast-import: Fix inc
o
r
r
ect fa
n
out level wh
e
n modif
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2nd testc
a
se exposing b
u
gs i
n
fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
t
9301: Fix testcase c
o
vering up a bug in fast-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Her
l
a
n
d
t
5
40
0
: Fix a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n
H
erland
Mar
k
dirstat error messages
for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
Herland
Improve error
h
andl
i
ng when parsing dirstat par
a
meter
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
N
e
w
--di
r
s
tat=li
n
es mode, doing dirstat analysis
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erla
n
d
A
ll
o
w specifying
-
-dirsta
t
cut-o
f
f perc
e
nt
a
ge as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herl
a
nd
A
d
d config variable for specifying defau
l
t --
d
ir
s
t
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Refact
o
r --dirstat parsing; dep
r
ecate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n
Her
l
and
Make
--di
r
stat=0 out
p
ut directo
r
i
e
s that
c
ontr
i
bute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Her
l
and
A
dd sev
e
ral testcases for --
d
i
rstat
and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
an Herland
--dirstat: In case of renames, us
e
t
a
rget filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n
H
erland
Teach
-
-dirstat
n
ot to
completely i
g
n
o
r
e
rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-dirstat-
b
y
-
fil
e
: Mak
e
it faster an
d
more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
-
-d
i
r
s
tat: De
s
cribe
n
on-obvious dif
f
erences
r
e
l
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herland
Make "git notes add" more use
r
-frien
d
ly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an Herlan
d
log/
p
retty-options
:
Document --[no-]notes and
d
eprec
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herl
a
nd
branch/checkout --track: E
n
sure
that u
p
stream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
oha
n
H
erlan
d
push
.
default
:
Rename 't
r
acking' to 'upstream
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
P
r
ovide 'git mer
g
e -
-
a
bort' as a
synonym to
'g
i
t res
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_
m
e
rge():
Parse o
p
t
ions before c
h
ecki
n
g MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Provide 'git notes get-ref'
t
o
easi
l
y retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add testcases for
m
e
r
ging notes tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
er
l
and
git notes merge:
A
d
d
a
noth
e
r auto-re
s
olvi
n
g st
r
ategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
git notes
m
erge: --com
m
it sh
o
uld
f
ai
l
if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erland
git notes merge:
Lis
t
confl
i
cting notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
g
it not
e
s m
e
rge
:
Manua
l
conflict
resoluti
o
n
, pa
r
t 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
g
i
t notes merge: M
a
nual conflict
r
esolution,
p
art 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation: Preliminary docs on 'git
n
otes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git n
o
tes merge: Ad
d
a
utoma
t
ic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Ha
n
d
l
e
real
,
non-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
builtin/notes
.
c
:
Refactor
creation
o
f no
t
es commi
t
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es
m
erge:
I
nitial imple
m
enta
t
i
on handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Split notes
r
ef D
W
IMmery
into a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
e
s
.
c: Use two
n
e
w
lines (instead of one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
(trivial) t3303:
Indent with tabs i
n
st
e
a
d
of
s
pac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c:
Propaga
t
e combine_note
s
_fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herla
n
d
n
ote
s
.
h
/
c: Allow
c
o
m
b
i
ne
_
not
e
s f
u
nct
i
o
n
s t
o
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
not
e
s
.
c: Reorde
r
functions
i
n preparat
i
on for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h: Make
d
e
fa
u
lt_notes_
r
ef() av
a
ilable in
n
otes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
(tri
v
ia
l
) notes
.
h: Minor
d
ocumenta
t
io
n
fixes to co
p
y_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
not
e
s
.
c: H
e
xify SHA1 in die() message from init_
n
otes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
n
otes: D
o
n't cre
a
te (empty) commit when
r
emoving no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herlan
d
Enable cu
s
to
m
schem
e
s
for
c
ol
u
mn
c
ol
o
rs in the gra
p
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herla
n
d
Make graph_nex
t
_
l
ine() a
v
ailable in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Turn off history simplificat
i
o
n
i
n
--ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
rland
revision: Fix typo in
-
-
ancestry-p
a
th error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herl
a
n
d
Documentation/
r
ev-l
i
st-optio
n
s
.
txt: Exp
l
ain --ance
s
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
Documentati
o
n/rev-lis
t
-
o
ptions
.
txt: Fix
missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
han H
e
rland
diff
.
c:
E
nsure "inde
x
$from
.
.
$
to" line
c
o
ntains un
a
mbi
g
u
ous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
bui
l
ti
n
-n
o
tes: Mi
n
or
(
mostly parse_o
p
tions
-
related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
H
erland
submodul
e
s
umma
r
y:
Don't barf when i
n
vok
e
d
in an
e
m
p
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
bui
l
tin-notes: Add "copy"
s
ubcommand fo
r
copying n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin
-
notes:
M
i
sc
.
refactoring of arg
c
a
n
d exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
l
an
d
builtin-not
e
s:
A
dd -
c
/-C optio
n
s for reusing
note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
built
i
n-notes: Ref
a
ct
o
r ha
n
dling
o
f -F option to
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n
-notes: Deprecate the -m/-F opti
o
n
s
for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
b
u
i
ltin-notes
:
Add "append" subcom
m
and
f
or appen
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
b
u
iltin-notes:
A
dd
"
add" su
b
command
for
a
dd
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
built
i
n-notes
:
Add --message/--file a
l
i
a
ses for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
builtin-notes: Add "list" subco
m
mand
fo
r
listing no
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Docum
e
n
tation: Gener
a
lize git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
u
iltin-notes:
A
dd "pr
u
ne" subc
o
m
mand fo
r
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
No
t
es
A
P
I
: prune_notes(): Prune notes
t
hat belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t3305: V
e
rify that removing notes triggers
a
utomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builti
n
-notes: A
d
d "re
m
ove"
s
ubcommand
for rem
o
v
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Teach
b
u
iltin-notes to
r
em
o
ve
empt
y
n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Te
a
ch notes code to properly preserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
t3305: Verify tha
t
a
dding many n
o
tes wit
h
git
-
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
t3301: Verify su
c
cessful annotation of non-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Built
i
n
-i
f
y git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor no
t
es concatena
t
ion int
o
a
f
l
exibl
e
interfa
c
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next