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
Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
2011-04-29
J
ohan Herland
Refac
t
o
r -
-
dirstat parsing; deprecate --cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n Herland
M
ake --
d
irstat=0 output directories th
a
t contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several testcases f
o
r
-
-dirs
t
at a
n
d
frie
n
ds
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan
Herland
--dir
s
tat: In
ca
s
e
o
f renam
e
s
, use target fil
e
n
a
me
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
ha
n
Herla
n
d
Teac
h
-
-
dirstat
not to compl
e
tely ignore rearr
a
nged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-file: Make it f
a
st
e
r and more
c
o
rrect
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--dirstat: Describe non-obvious di
f
ferences rela
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
erland
branc
h
/check
o
u
t
--track: Ensure that
u
ps
t
ream
b
r
an
c
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan H
e
rland
push
.
d
efault: Ren
a
me 'track
i
n
g
'
t
o
'upst
r
eam
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Provide 'git
m
e
r
g
e --ab
o
rt' as a sy
n
onym
t
o
'git
r
eset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rl
a
n
d
cm
d
_merge(): Parse optio
n
s before ch
e
cki
n
g M
E
RGE_HE
A
D
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rla
n
d
Prov
i
de 'git notes
g
et-ref' to easily retrieve cur
r
ent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge: Add t
e
stcases for merg
i
ng notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git
n
otes
m
erge: Add a
n
othe
r
auto-re
s
olving st
r
a
t
e
gy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: --
c
o
mmit
s
hould fail if
u
nderlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git note
s
merge: List
confl
i
cting notes
in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
Herland
gi
t
notes merge: Manual conflict resolutio
n
, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
git
n
o
t
e
s merge:
Manual
c
onflict res
o
lution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
D
ocume
n
tat
i
o
n: Preli
m
inary do
c
s on 'gi
t
note
s
merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git n
o
tes
m
erge: Add automatic
c
onfl
i
ct re
s
olve
r
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
g
it notes merge:
H
andle r
e
al
,
non-conflic
t
ing no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an H
e
rland
built
i
n/notes
.
c:
Refactor c
r
eatio
n
of no
t
es
c
ommits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes m
e
rge: Initial impl
e
m
entat
i
on handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herla
n
d
b
u
il
t
in/n
o
tes
.
c
: Split notes ref DWIMm
e
ry int
o
a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
n
ot
e
s
.
c: Use two newlines (instead of one)
w
hen concaten
a
t
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
(trivial) t3303:
Inde
n
t wit
h
tab
s
in
s
tead of space
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
note
s
.
h/c: Propagate combine_notes_fn ret
u
rn value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow combi
n
e_not
e
s
functions t
o
r
emove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
c
:
R
e
order funct
i
o
ns in
p
reparation for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
not
e
s
.
h: Make default_not
e
s_re
f
(
)
a
vailable i
n
notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
n
d
(t
r
ivial) notes
.
h: Mi
n
or
d
ocumentati
o
n fixe
s
to copy_n
o
tes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
c: Hexify SHA1 in die() message from init_not
e
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
an H
e
rland
notes: Do
n
'
t
create (empty)
c
o
mmit when removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
a
n
d
Enable c
u
s
t
om sch
e
m
e
s
for col
u
mn colors in the
graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
erland
Make gr
a
ph_next_li
n
e
(
) av
a
ilable in t
h
e graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
re
v
ision: Turn off histo
r
y si
m
p
lification in --an
c
estry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
revi
s
ion: Fix typo in --ancestry-path
er
r
or message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
a
n Herla
n
d
D
ocum
e
ntation/rev-l
i
st-
o
p
t
ions
.
txt: Explain --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docume
n
tati
o
n/rev-l
i
st-
o
pt
i
o
ns
.
t
x
t: Fi
x
miss
i
n
g
lin
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
J
o
han Herl
a
nd
diff
.
c: Ensure "index $from
.
.
$to" line contains
u
nambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
o
h
an Herl
a
nd
bu
i
ltin-no
t
e
s: Minor (
m
ost
l
y parse_optio
n
s
-re
l
a
ted
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
o
h
an Herland
submodule su
m
m
a
ry:
D
o
n't barf
w
hen invoked in an emp
t
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
builtin-n
o
te
s
:
Add "copy" subcommand for
c
o
pying
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-note
s
: Misc
.
r
e
f
actor
i
ng of argc and
exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
t
es: Add -c/-C
opti
o
n
s for
r
eu
s
ing
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herlan
d
builtin-notes
:
Refacto
r
ha
n
dling of -F
o
p
ti
o
n
t
o
allo
w
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
builtin-not
e
s:
Deprecate the
-m/
-
F
o
ptions for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
notes: A
d
d
"append"
s
ubcomm
a
nd
for
a
pp
e
nding
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-
n
o
t
es
:
Add "ad
d
" sub
c
ommand for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
builtin-
n
otes: Add
--message/--file
a
liases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-no
t
es: Add "list"
s
u
b
command for
listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Do
c
umenta
t
io
n
:
G
eneralize git-n
o
tes docs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
bui
l
t
in-notes: Add "prune" su
b
com
m
and fo
r
removin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes
A
PI:
p
rune_notes(): Prune notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t3305: V
e
r
i
f
y that rem
o
ving notes triggers a
u
tomatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes
:
Add "rem
o
ve" subcommand
for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teac
h
bui
l
tin-notes
to remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
Teac
h
no
t
es code to
p
roperly pre
s
erve non-note
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t330
5
: V
e
rify that
a
dd
i
ng m
a
ny no
t
es with
git-no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t33
0
1:
Verify succes
s
ful
a
nnotat
i
on of non-
c
ommi
t
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Bu
i
ltin-i
f
y
git-note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
Refactor
n
ote
s
co
n
ca
t
enation int
o
a
flex
i
b
le
i
nterface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI: Allow m
u
l
tiple co
n
current notes
t
re
e
s with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
Notes
API
:
write_notes_
t
re
e
():
Stor
e
the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
N
otes API: for_
e
ach_not
e
(): Traverse
t
h
e entire n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI
:
g
e
t
_note(): Return the note annotati
n
g the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes A
P
I: remove_no
t
e(
)
: Remove not
e
obje
c
t
s from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: add_note(): Add note objects to th
e
i
n
ternal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
N
o
t
es API:
init_n
o
tes():
I
n
itialize the notes
t
ree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Add
tes
t
s
for che
c
ki
n
g correct handl
i
ng
o
f $GIT_NOTES_RE
F
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
N
o
te
s
A
PI: get_
c
ommi
t
_notes() ->
format
_
note() + rem
o
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
H
e
r
land
M
inor cosmeti
c
fixe
s
to
n
otes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-config: Fix
c
r
a
sh when
using "-f <re
l
ati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herla
n
d
A
d
d
more
t
estca
s
es to
test fas
t
-import of
n
otes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan He
r
land
Rename
t9301 to
t9350, to make room for
m
o
r
e fast-imp
o
rt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herlan
d
fast-import: Proper notes tr
e
e
mani
p
ulat
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fi
x
cra
s
her
o
n e
n
c
o
untering SHA1-
l
ik
e
non
-
no
t
e i
n
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Joh
a
n Herland
B
asic buil
d
infrastructu
r
e
for Python scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add
se
l
ft
e
sts verifying co
n
catenatio
n
of mult
i
ple
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Refactor notes code to
concate
n
a
t
e mul
t
iple notes annotating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
Add
selftests
verifying that
w
e
can parse notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Teach the not
e
s
l
o
okup code to parse notes
trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Teach
n
otes code to
fr
e
e its
i
nternal d
a
ta
s
t
r
u
ctures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
A
d
d
flag
s
to g
e
t_commit_notes()
t
o control the
f
ormat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t
3
302-notes-index-expensive:
S
peed up create_repo
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
fast-import: Add su
p
port for importing commi
t
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Teach
"
-m <m
s
g
>"
and "-F <file>
"
t
o
"git not
e
s
edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clon
e
:
A
dd --recursive to aut
o
matically checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
J
o
ha
n
H
erland
t
7
407: Us
e
'rev-
p
arse --short' rather than
b
a
s
h
'
s su
b
s
t
ring
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git s
u
bmodule
s
tatus: Add --recu
r
sive to recurse in
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han H
e
rland
g
i
t submodul
e
update
:
Introduc
e
--recursive to up
d
ate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
git submodu
l
e
f
oreach: Add -
-
recursive to recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
git submodule foreach:
t
e
st access to su
b
modul
e
n
ame
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herlan
d
A
d
d
se
l
ftest for 'git submodul
e
foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
g
i
t sub
m
odule: Cleanup usage string and
add option
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
J
o
han Her
l
and
git submodule for
e
ach:
P
rovid
e
a
c
cess to sub
m
odul
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
J
o
h
a
n
H
erland
help
.
c
:
give correct st
r
uctu
r
e's
s
i
ze to me
m
set()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Joha
n
H
erl
a
nd
quickfe
t
ch():
Prevent overflow of the rev-list
co
m
mand
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
git-submodule
:
a
dd s
u
pport
f
or --merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Her
l
and
Rename sub
m
odule
.
<
n
a
m
e
>
.
re
b
ase to submodul
e
.
<name>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next