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-svn: Warn about changing default for --prefix in Git v2.0
2013-10-12
Johan
H
erland
git-svn
:
Warn about changing defa
u
lt
f
or --prefix in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan
H
erland
D
oc
u
mentati
o
n/git-svn
:
P
romote the us
e
of
-
-p
r
efix
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
a
n
Herland
t3200: Add test d
e
monstrating minor reg
r
ession in 41c21f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Herland
R
e
f
er to branc
h
.
<
n
ame>
.
rem
o
te/merge when do
c
umenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
ohan H
e
rl
a
nd
t3200: Minor fi
x
whe
n
prepa
r
i
ng f
o
r tracking
failure
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n He
r
land
t
2
024: Fix &&-chaining an
d
a couple of
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
land
Move cr
e
ate_notes_co
m
mi
t
() fro
m
not
e
s
-merge
.
c int
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Her
l
and
M
ove copy_note_f
o
r
_
rewrite + fr
i
ends fr
o
m
b
u
ilti
n
/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an Herland
finish_copy_
n
otes_fo
r
_
r
e
write(): L
e
t caller provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glossa
r
y
:
Update and rephra
s
e the
definition of a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c:
V
alidate
trackin
g
branches with refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t91
1
4
.
2: D
o
n'
t
use --track
o
p
t
i
on a
g
ain
s
t "svn-remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n He
r
land
t720
1
.
24:
Add
r
efspec t
o
keep --t
r
ack
w
o
r
king
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3200
.
3
9
:
tracki
n
g setup shou
l
d fail i
f
there
i
s n
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n He
r
land
checkout: Use
r
emo
t
e refsp
e
cs when
DWI
M
ming tr
a
ck
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erl
a
nd
t2024: Show
failure to use r
e
fspec when
D
WIMming remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han
Her
l
and
t2024: Add tes
t
s veri
f
ying current DWIM
behavior o
f
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symb
o
l
ic-ref --delete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix failure
to delete a packed ref t
h
r
o
ugh a sym
r
ef
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
t1400-update-re
f
:
Add
test ver
i
fying bug wi
t
h
s
ymr
e
fs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
n
o
tes-
m
er
g
e: Don't remove
.
git/
N
OTES_MERGE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herla
n
d
notes-merge: us
e
open
d
ir
/
readdi
r
i
n
st
e
ad
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
nd
t
3
310: ill
u
strate failure t
o
"notes merge --
c
omm
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
fast-import: Fix incorrect fanou
t
level when mo
d
ifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
t9
3
01: Add 2nd te
s
tcase exposing bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herlan
d
t
9
301: Fix testca
s
e covering up a b
u
g
in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n Herlan
d
t54
0
0: Fix a co
u
p
le of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dirstat error mes
s
ag
e
s f
o
r
transla
t
ion
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve err
o
r hand
l
ing whe
n
p
arsing
d
irstat paramet
e
rs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
N
ew --dir
s
tat=line
s
mod
e
, d
o
i
n
g
dirstat analysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han He
r
land
Al
l
ow sp
e
cifying --
d
irstat cu
t
-off percentag
e
a
s a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
dd co
n
f
i
g va
r
iabl
e
for spec
i
fying defau
l
t
--dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor --dirstat parsing; deprecate --cum
u
la
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make
-
-
d
irst
a
t
=
0 output di
r
ectories
that
c
ont
r
ibute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herla
n
d
Add sever
a
l
t
estcas
e
s for --dirstat and friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herlan
d
--dirstat: In case
o
f renames, use tar
g
et filena
m
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
Teach --dirstat n
o
t to
com
p
letel
y
igno
r
e rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by
-
file: Make
i
t
f
aster and more corr
e
ct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--di
r
stat: De
s
cribe non-ob
v
ious
diffe
r
ences rel
a
tive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
la
n
d
Make "git not
e
s add" more user-friendly whe
n
there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log
/
pretty-optio
n
s: Document --[no-]not
e
s and
d
epreca
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han
Herlan
d
b
ranch/checkout
-
-t
r
ack: En
s
ur
e
t
hat
u
pstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herland
push
.
default: Ren
a
me 'tracking' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide
'
git merge --ab
o
rt
'
a
s
a synon
y
m to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
cmd_mer
g
e(): Parse op
t
ions b
e
fore checking MERGE_
H
EAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Provid
e
'gi
t
notes get-ref' to easi
l
y retrieve curr
e
nt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
git notes merge: Add testcases for merging
notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
g
i
t notes
merge: Add
a
nother aut
o
-resolv
i
ng strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herlan
d
git notes mer
g
e: -
-
commit should fail if underlyi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git
n
otes merge
:
List
c
onflic
t
i
n
g
n
otes in notes
m
erge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herlan
d
git notes merge: Manual
conflict reso
l
ut
i
on
,
part 2/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
me
r
ge: Manua
l
co
n
fli
c
t r
e
s
olution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Doc
u
me
n
tation: Prelimi
n
ary docs on 'git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Ad
d
autom
a
tic c
o
nf
l
ict
resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
g
it
not
e
s merge: H
a
ndle r
e
al,
non-conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bu
i
lti
n
/notes
.
c
: Refactor creation of notes com
m
i
ts
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rla
n
d
git notes merge: In
i
tial implementation handling tr
i
vial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bu
i
ltin/not
e
s
.
c: Sp
l
it notes re
f
DW
I
Mm
e
ry into
a
separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
r
l
and
not
e
s
.
c:
Use two newli
n
es (i
n
s
tead
of on
e
)
w
hen con
c
a
tenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Her
l
and
(trivial) t3303: I
n
dent
w
i
t
h tabs in
s
tead o
f
spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
e
s
.
h/c: Propagate
c
ombi
n
e_n
o
tes
_
f
n retu
r
n value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/
c
:
A
llow combine_notes
f
unctions
to remov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c:
Reorder f
u
nc
t
ion
s
in
preparati
o
n
for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h: Make de
f
ault_notes_ref() availabl
e
in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herl
a
nd
(trivial
)
n
o
te
s
.
h: Minor
d
o
cumentation fixes to copy
_
notes
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c
: He
x
ify SHA1 in
d
ie(
)
mes
s
age from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan
H
e
rland
notes
:
Don't create (em
p
ty) c
o
m
m
it
w
hen remov
i
ng
n
on
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an
H
e
r
land
Enabl
e
c
ustom schemes for
c
olumn colors in the g
r
a
ph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
e
rland
M
a
ke gr
a
ph_next
_
line() avai
l
able in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
revision:
Turn off h
i
story simpli
f
ication in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
revision
:
Fix typo in
--a
n
cestry-p
a
th error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docum
e
ntation/rev-list
-
options
.
txt: Explain --ancestr
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
e
rla
n
d
Do
c
umenta
t
ion/rev-
l
i
s
t-options
.
txt: Fix missin
g
line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herland
diff
.
c: En
s
ure "index $
f
rom
.
.
$to" line c
o
ntai
n
s
u
nambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan He
r
l
a
nd
buil
t
in-notes: M
i
nor (mostly pa
r
se_
o
ptions-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan
H
erland
submodule s
u
mm
a
ry
:
Don't
b
ar
f
when
inv
o
k
ed in
a
n
empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-not
e
s: Add "cop
y
"
s
ubcommand fo
r
copyin
g
no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
builtin-notes: Misc
.
refactoring of argc a
n
d
exit val
u
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
builti
n
-notes: Add -c/-C opti
o
ns for reusing
n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-note
s
:
R
e
f
acto
r
han
d
ling
o
f -F
optio
n
to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
ltin-notes: Depreca
t
e
t
he -m/-F options for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
builtin-notes: Add "append" subcomma
n
d for appendi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes:
A
dd
"
add"
subcommand for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
built
i
n-
n
ote
s
: Add
--message
/
--file ali
a
ses for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
builtin-notes:
A
dd "
l
ist"
subcommand for li
s
ting note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Do
c
umentation: Gen
e
ralize
g
it-notes d
o
cs
to '
o
bjects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
builtin-not
e
s:
A
d
d "
p
ru
n
e" subcommand
f
o
r
removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
N
otes API: prune_notes(): Prune notes t
h
at belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t3305:
V
erify that
r
emo
v
ing notes triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin
-
notes
:
A
d
d
"re
m
ove" subco
m
mand for
r
emov
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
Teac
h
b
u
ilti
n
-notes to remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Teach notes code to properly pre
s
erve non-
n
otes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify that adding m
a
ny no
t
es with
g
it-no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify successful annotation of
n
on-c
o
m
mits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-ify
g
it-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refa
c
tor notes concat
e
n
a
tion into a
f
lexible in
t
erface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rlan
d
Notes API: All
o
w multiple concurrent notes trees wi
t
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
No
t
es
API: writ
e
_
n
ote
s
_
t
ree():
Store the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
for_ea
c
h_note(): Traverse
the
entire not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herl
a
n
d
N
o
tes API: get_not
e
(
)
:
R
eturn the
note
a
nnotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next