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 Herland
Gi
t
2
.
0: git sv
n
: Set
default
--prefix='origin/' if
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-02-20
Joha
n
H
erland
notes: dis
a
llo
w
reusi
n
g
non
-
bl
o
b as a note object
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-28
Johan Herland
s
ha1_file
.
c:c
r
eate_tm
p
file(): Fix ra
c
e when creatin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
git-s
v
n:
W
a
rn
about changi
n
g
de
f
ault fo
r
--prefix in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
J
ohan
H
er
l
and
Documentati
o
n/gi
t
-s
v
n:
P
rom
o
te the use of --prefix
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-24
Johan
Herland
sample pre
-
com
m
it hook: use --bool
when r
e
tr
i
eving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
a
n
Herlan
d
t320
0
: Add test
demons
t
ra
t
ing min
o
r
regression in 41c21f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Ref
e
r to
b
ranch
.
<na
m
e>
.
remote/merge when
d
ocumenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
nd
t3200: M
i
nor fix
w
hen preparin
g
for tracking fai
l
ure
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Herland
t
2
024:
F
ix &&-chaining and a c
o
uple o
f
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herla
n
d
Mov
e
create_notes_commit
(
)
from notes-merge
.
c
i
nto
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
land
Move copy_not
e
_
for_rewrite
+ fr
i
en
d
s
f
rom builti
n
/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herl
a
nd
finish_copy_n
o
te
s
_for_rewrite
(
):
L
et cal
l
er provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
glossary: Update
an
d
rephr
a
s
e
the definitio
n
of a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Valida
t
e
t
racki
n
g b
r
anches with
r
efs
p
e
c
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t91
1
4
.
2:
D
on
'
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 Herland
t7201
.
24: Ad
d
refspec t
o
keep --track
w
o
rking
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herla
n
d
t3200
.
39: tr
a
c
k
ing setup should fail
i
f
t
h
e
re i
s
no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
c
h
eckout: Use
r
emo
t
e ref
s
pecs when DWIMming t
r
ackin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Show failur
e
to use re
f
spec wh
e
n
DW
I
Mming rem
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t2024: Add tests verifying cu
r
ren
t
D
W
IM behavior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
g
i
t sy
m
bolic-ref --delete
$
symre
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an H
e
r
l
and
Fix
f
a
i
lure t
o
delete a packe
d
ref th
r
ough a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-update
-
r
ef: Add test verifying b
u
g with sy
m
r
e
fs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-mer
g
e:
D
o
n't remov
e
.
gi
t
/NOTES_M
E
R
G
E_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herland
notes-m
e
r
g
e: use opendir/readdir inst
e
ad of u
s
ing read_di
r
ec
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
t3310: illustrat
e
f
a
i
lure
to
"not
e
s merg
e
--co
m
mit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
fast
-
imp
o
rt
:
Fix incorrect f
a
n
out
l
evel
when modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2nd tes
t
case ex
p
osing bugs
i
n fast-imp
o
rt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herl
a
nd
t930
1
: Fi
x
t
estcase co
v
er
i
n
g
u
p
a
bug in fast-i
m
port
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herlan
d
t5400: Fix a
co
u
ple o
f
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herl
a
nd
Mark dirstat erro
r
me
s
sages
for trans
l
a
tion
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Improve err
o
r
han
d
l
i
n
g
when parsing
dirstat parame
t
ers
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dirstat=
l
ines mode,
d
oing dirstat analysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
Herl
a
nd
Allow specify
i
ng --dir
s
tat cut-off
p
ercentag
e
as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Ad
d
c
o
nfig variable
f
or specifying defaul
t
-
-dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
r
land
Refactor --dirs
t
at
p
arsin
g
; deprecate --cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Make
-
-
d
i
rs
t
a
t=0
o
utp
u
t directories tha
t
c
on
t
rib
u
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
A
d
d
several testcases for
-
-dirs
t
at and frien
d
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
a
n
Herla
n
d
--dirsta
t
:
In c
a
se of renames, u
s
e
target
f
i
lename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
Tea
c
h --dirstat not t
o
c
ompletely ignore r
e
arranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-file:
M
a
ke it faster and more co
r
rect
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
er
l
an
d
--di
r
stat: D
e
scribe n
o
n-ob
v
ious diff
e
rences relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n Herl
a
nd
Make "g
i
t n
o
tes add
"
more user-
f
riendly w
h
en
t
here
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pre
t
ty-options:
D
ocument --[no-]not
e
s
a
n
d deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herlan
d
b
r
anch/ch
e
ckout --trac
k
:
En
s
ure that u
p
stream br
a
nc
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herlan
d
push
.
default: Ren
a
me 'trackin
g
' t
o
'u
p
stream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
l
a
nd
P
r
ovide 'git merge --abo
r
t' as a synon
y
m
t
o
'
git res
e
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
cmd_merge():
P
arse op
t
ions before checking MERGE
_
HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provi
d
e 'git notes get-ref' to easily retriev
e
current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
rlan
d
git notes merge
:
A
dd testc
a
ses for mer
g
ing notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
gi
t
notes
me
r
ge
:
A
d
d an
o
t
h
e
r a
u
to-resol
v
ing
strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
m
erge: --com
m
it sh
o
uld fail if underl
y
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
notes mer
g
e: List conflicting n
o
tes in
notes mer
g
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes merge:
M
anual confli
c
t res
o
luti
o
n, p
a
rt 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git no
t
es merge: Manual conflic
t
re
s
olution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
Documentation: Preliminary docs on 'git
n
otes m
e
r
g
e
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git
n
o
t
es
merge: Add autom
a
tic conflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herlan
d
git notes merge: Han
d
le
r
ea
l
,
n
on-conflicting
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bui
l
tin/notes
.
c: Refactor creati
o
n of n
o
tes
commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
l
and
git notes
merge: Initi
a
l imp
l
e
m
entat
i
on handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
b
u
iltin/notes
.
c: Split notes
r
ef DWIMmery into a s
e
parate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
notes
.
c: Use two newlines (
i
nstead
of
one) when conc
a
t
e
na
t
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
(
t
r
i
v
i
al)
t3303: In
d
en
t
with tabs instead o
f
s
p
aces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
es
.
h/c: Propagate combine_note
s
_fn r
e
turn
value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rlan
d
notes
.
h/c: Allo
w
combine_no
t
es functi
o
ns to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
note
s
.
c: Reorder
f
unctio
n
s
in prepa
r
ati
o
n for n
e
xt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
He
r
l
a
nd
notes
.
h:
M
ake default_notes_ref() a
v
ai
l
able i
n
notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n He
r
l
a
nd
(triv
i
al) note
s
.
h: Minor documen
t
ation fixes to c
o
py_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
n
o
tes
.
c
:
H
exify SH
A
1 in
di
e
() messa
g
e fr
o
m init_not
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't create (empty
)
commit when removing
non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
En
a
ble cu
s
t
om schemes for column colors i
n
the g
r
aph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
nd
Make
g
raph_next_line() available in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
re
v
isi
o
n: Turn of
f
h
i
story simp
l
ifi
c
ation in --anc
e
str
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision:
F
ix
typo
i
n --ancestry-path
e
rror message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
u
m
entation/rev-li
s
t-options
.
txt: Explain
-
-ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documenta
t
ion/rev-list-optio
n
s
.
txt: Fix missin
g
line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
di
f
f
.
c: Ensure
"
inde
x
$from
.
.
$to" line
cont
a
ins unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan Herland
builti
n
-
notes: Minor (m
o
s
tly parse_op
t
i
o
ns-relat
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
subm
o
d
ule
summary: D
o
n't
bar
f
wh
e
n
invoked in
an emp
t
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add "copy"
s
ubcom
m
a
n
d for copying n
o
t
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
built
i
n-notes: Misc
.
refactor
i
n
g
of argc and
exit
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes: Add -c/-C opti
o
ns for reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-n
o
t
e
s: Refactor handling of -F optio
n
to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
bui
l
tin-no
t
e
s: Deprecate the -m/-F options f
o
r "gi
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
ltin-notes: Add "append"
s
ubcommand for appendi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "
a
dd"
subcommand for
a
dding
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
a
nd
bu
i
l
tin
-
notes: Add
--message/--file a
l
iases fo
r
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes: A
d
d "li
s
t" su
b
command for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Document
a
tion: Gener
a
l
i
ze git-n
o
tes docs to 'obje
c
ts
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herla
n
d
b
u
i
lti
n
-
no
t
es: Add "pr
u
ne" subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes API: pru
n
e_notes():
P
r
u
ne n
o
te
s
that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
t330
5
:
Verif
y
tha
t
removing n
o
t
e
s trigge
r
s
auto
m
a
tic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin
-
notes:
Add "remove" subcommand for removi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
Teach
b
ui
l
tin-notes to
remove empt
y
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Teach
notes c
o
d
e to prope
r
l
y preserve non
-
notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
n
d
t3305: Verify
tha
t
adding many notes wi
t
h git-no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
t
3
301: Verify suc
c
essful
annotation of non-
c
omm
i
t
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Builtin-ify g
i
t-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Refactor notes concatenation into a fle
x
ible
inte
r
face
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next