repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
2013-06-12
Johan Her
l
a
nd
Mo
v
e co
p
y_
n
ote_for_r
e
wr
i
te + friends from builtin/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
f
in
i
s
h
_copy_
n
otes_for_rewrite():
L
et calle
r
provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symboli
c
-ref --delete
$
s
y
mref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fi
x
failure
to de
l
e
t
e a packe
d
r
e
f through a sym
r
ef
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan
H
erland
t
1400-up
d
ate-ref: A
d
d
test
verifying bug with
s
ymrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
erland
n
o
t
es
-
merge:
D
on't remove
.
git
/
N
OTES_M
E
RGE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-m
e
r
ge
:
us
e
ope
n
di
r
/readdir instead o
f
usi
n
g read_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han
He
r
land
t3310: il
l
ust
r
ate failur
e
to "
n
otes mer
g
e --comm
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
f
ast-import: Fix inco
r
r
e
c
t
fanout level when modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
t9301:
A
d
d
2nd testcase exposin
g
bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
t9301:
F
ix testcase
c
overi
n
g
up a bu
g
in fast-
i
mport
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix
a
c
o
u
ple o
f
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Mark dirs
t
a
t
error
me
s
sages for translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Im
p
rove error hand
l
i
n
g
w
h
e
n parsing dirsta
t
p
a
rameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dirstat=lines
mode, doing
dirstat
a
nal
y
s
is based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
A
llow spec
i
fying
-
-dirstat cu
t
-off p
e
rc
e
ntage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add con
f
ig variable for specifying de
f
ault --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refacto
r
-
-
dirstat
p
a
rsing; deprecate --cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Make
-
-dir
s
t
a
t=0 outp
u
t
directories
that c
o
ntribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Add
s
evera
l
testcase
s
for --dirstat
a
nd
friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan H
e
r
land
--dirsta
t
:
In cas
e
o
f
rena
m
es, use
t
a
r
get filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
Teach
--d
i
rstat
n
ot to completely i
g
n
ore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-file: Make it fast
e
r and mo
r
e correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--
d
irst
a
t: De
s
cribe n
o
n-obv
i
ous
d
ifferences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han
H
erland
Make "gi
t
notes add" more user
-
friend
l
y whe
n
there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
Herla
n
d
log/pretty-options: Do
c
u
ment --[no-]notes and depr
e
cate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han Herlan
d
branch/c
h
eck
o
ut --track: Ens
u
r
e
that u
p
s
t
ream
branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Joha
n
He
r
land
push
.
default: Rename 'trac
k
ing' to '
u
pstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge --abort' as a synonym to 'git
r
eset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_me
r
ge(): Par
s
e options bef
o
re checking MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Pro
v
ide 'git n
o
tes get
-
ref' to e
a
sil
y
retriev
e
curren
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
git note
s
m
e
rge: Add testcases for merging notes
t
rees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
g
it
n
otes
merge
:
Add anot
h
er
a
u
to-resolving strat
e
gy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git note
s
merge
:
--commit should fail if
underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge
:
L
i
s
t co
n
fli
c
ting notes
i
n
notes m
e
rge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
g
i
t note
s
merge: Manual conflict re
s
ol
u
tio
n
, p
a
r
t
2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge: Manual conflict
r
esolution, part
1
/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
Docume
n
tation: P
r
elimin
a
ry do
c
s on 'git notes
m
erg
e
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an He
r
land
gi
t
no
t
es merge: Add automa
t
i
c
confl
i
ct re
s
olv
e
rs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes
m
e
rge: Han
d
le rea
l
, non-con
f
licting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
builtin
/
not
e
s
.
c:
R
efactor creation o
f
notes
c
o
mm
i
ts
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes
m
erge: Initial
implem
e
n
ta
t
i
on handling tr
i
v
ial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
bui
l
tin/notes
.
c: Split notes
r
ef
D
WIMme
r
y i
n
to
a
separa
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herland
n
o
tes
.
c:
Use two
n
ewlines (
i
ns
t
ea
d
of one) when concatenat
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Her
l
and
(
t
rivial) t3303: Indent with tabs instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/
c
: Propaga
t
e
comb
i
ne_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c:
Allow combine_note
s
functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n
Herland
not
e
s
.
c: Reorder functio
n
s in prepar
a
tion for
n
ext
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n
Herla
n
d
not
e
s
.
h: Make d
e
fa
u
lt_no
t
es_ref() availabl
e
in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(triv
i
al
)
no
t
es
.
h:
M
i
nor documentation fixes to
copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
c: H
e
xify SH
A
1 in die
(
) message fr
o
m init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don'
t
create (
e
mpty) commit whe
n
removi
n
g
n
o
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herl
a
nd
E
nable custo
m
sche
m
es
f
or
column colors in t
h
e
graph
A
PI
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
M
a
k
e
g
raph_ne
x
t
_line
(
) avai
l
able in
the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erlan
d
r
evisi
o
n: Turn off
history simp
l
ification i
n
-
-ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan
H
er
l
and
revision: Fix
typ
o
in --ancestry-path er
r
or messa
g
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
Docum
e
ntation/rev-list-options
.
txt: Explain --anc
e
str
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
Docum
e
n
t
at
i
on/
r
ev-li
s
t
-
opt
i
ons
.
txt:
Fix
m
issing
l
ine
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: En
s
ure "index $from
.
.
$
t
o"
l
ine contai
n
s
u
n
a
mbigu
o
us
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan Her
l
a
n
d
built
i
n-note
s
:
M
inor (
m
ostly parse_opti
o
ns-
r
elated
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
submodu
l
e summary
:
Don't bar
f
when invoked in an
empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add "copy" subcommand f
o
r
c
o
pying
n
ot
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
b
uiltin-notes: Misc
.
refactoring
of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes: A
d
d -c/-C options
f
o
r reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
builtin-no
t
es: Refact
o
r handling of -F o
p
ti
o
n to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
builtin-notes: Deprecate t
h
e -m/-F options for
"
git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
ot
e
s
:
A
dd
"appen
d
" subc
o
mmand
for app
e
nd
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erla
n
d
builtin-
n
o
t
es: Add "add" su
b
command for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
uiltin-note
s
: Add --message
/
-
-
file
aliases
f
or
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bu
i
ltin-
n
otes: Ad
d
"lis
t
" s
u
b
c
omm
a
nd for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herla
n
d
Documentation:
G
eneralize git-notes docs to '
o
bjects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Add "
p
rune" subcommand for remo
v
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s
API: prune_notes(): Prun
e
no
t
e
s
that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305:
V
erify that
remov
i
ng no
t
es triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
not
e
s
:
Add "r
e
move"
subcommand for rem
o
vi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Teach builtin-
n
otes to
r
em
o
ve empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Te
a
ch notes code to
proper
l
y pr
e
serve
no
n
-note
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t3305: Verify tha
t
addi
n
g many no
t
es with g
i
t-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify successfu
l
a
nnotation
of non-commi
t
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-ify git-note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
Refactor
notes co
n
cat
e
n
ation into a flexible
i
nt
e
rface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Not
e
s
API: All
o
w mult
i
ple concurrent notes trees
w
ith
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API: wri
t
e_notes_
t
ree
(
)
: Store t
h
e notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: for_eac
h
_not
e
():
T
rave
r
s
e the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
an
d
Notes
API:
g
e
t_note():
Return
the note a
n
notating
the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes
A
PI:
remove_note(): Remove note objects fro
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
N
o
tes API: add_note():
A
dd note o
b
je
c
ts to the internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
: init_n
o
tes(): In
i
tialize the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
H
erland
Add tests for checking
c
orr
e
ct handling of
$
GIT_N
O
TES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
get
_
commit_notes
(
)
-
> format_
n
ote
(
) + re
m
ove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmetic
f
i
x
es
to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-co
n
fig: Fix crash w
h
en using "-f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
A
d
d more
t
e
stcases to test fast-impo
r
t of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
He
r
la
n
d
R
e
name t9301 to t9350, to make r
o
om for more fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
f
ast-import: Proper
n
otes tr
e
e
m
anipul
a
tion
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan He
r
land
Fix crasher on
encountering S
H
A1-lik
e
non-note in
n
ot
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic
build infras
t
ructu
r
e for Python scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
A
dd selfte
s
ts verifying concatenati
o
n of multiple n
o
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Re
f
act
o
r notes
c
o
d
e
t
o conca
t
en
a
te multiple notes anno
t
ating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
n
d
Add
selftests verifying that
we
can pars
e
notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next