repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
howto/maintain: document "### match next" convention in jch/pu branch
2012-10-21
Johan Herlan
d
F
ix failure to dele
t
e a packed
r
ef t
h
ro
u
g
h a symr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herlan
d
t1400-upd
a
te-ref: Add test
verifyi
n
g bug with s
y
mrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herl
a
nd
notes-merge: Don
'
t
rem
o
ve
.
git/NOTES_
M
ERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herl
a
nd
notes-merge: use opendir/readdir inst
e
ad of u
s
ing read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310: illus
t
rate fa
i
l
ure t
o
"notes merge
--commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
h
an Herlan
d
fast-imp
o
rt: Fix inc
o
rr
e
ct fanout
level when mo
d
ifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erlan
d
t9301: Add 2nd
t
est
c
ase exposing bugs i
n
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301
:
Fix
t
estc
a
se cove
r
ing up a bug in fas
t
-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
er
l
and
t
5400: Fix a
couple of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Mark di
r
s
t
at error messages
f
o
r translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
erland
Improve er
r
or handling when parsing
dir
s
ta
t
paramete
r
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
ha
n
Herland
New -
-
dirstat=lines
mode
,
do
i
ng dirstat ana
l
ysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Al
l
ow
specifying --
d
i
r
s
ta
t
cu
t
-off percentage as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rla
n
d
Add confi
g
variable
f
or sp
e
cifyi
n
g
default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Refactor --
d
ir
s
ta
t
parsing; deprecate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Mak
e
--d
i
r
s
t
at=0
output d
i
rectori
e
s that
c
ontribut
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Add sever
a
l testcases for --d
i
rstat
and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herla
n
d
--
d
i
rstat: In cas
e
o
f renames
,
use
target fi
l
enam
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
Teach --dirstat not to completely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
--d
i
rs
t
a
t-
b
y-file: Make i
t
faster and mo
r
e correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
--dir
s
tat: D
e
scribe n
o
n-obvi
o
us differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git notes
a
d
d
" more user-fr
i
endly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
ha
n
Her
l
and
log/pr
e
t
ty-options: Doc
u
m
ent --[no-]n
o
tes and de
p
recate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/check
o
ut
--track: Ensur
e
that upst
r
eam bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
H
erla
n
d
push
.
default: Ren
a
me 'track
i
ng' to 'u
p
strea
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
Provide 'git
m
erge --abort
'
as a synonym to 'git rese
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
c
md_merge(): Parse options before
c
h
e
ckin
g
MERGE_HEA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
Provide 'git notes get-ref'
to easily
ret
r
i
e
v
e
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge
:
A
dd testcases
for merging
n
otes
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge
:
Ad
d
anot
h
er a
u
to-resolving
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
g
it
n
ote
s
merge: -
-
commit should fail if underlyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
g
it note
s
merge: List
c
onflictin
g
notes in notes m
e
rge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s merge: Manual conf
l
ict resolution, part 2
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
notes merge: Ma
n
u
a
l
conflict resolution, part
1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Docu
m
entatio
n
: Preli
m
inary docs on 'g
i
t notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
g
it notes mer
g
e: Add au
t
omatic con
f
l
i
ct
resol
v
ers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
o
tes me
r
ge: H
a
nd
l
e real, non-confl
i
cting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
bui
l
tin/no
t
es
.
c
: R
e
factor c
r
eation
o
f
n
otes c
o
mm
i
ts
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merg
e
:
I
nitial
i
mpleme
n
tat
i
on
h
a
n
d
ling tri
v
i
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
builti
n
/
n
otes
.
c: Split notes ref D
W
I
M
mery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c:
U
se two newline
s
(
i
nste
a
d of one)
w
h
e
n concate
n
atin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
(trivia
l
) t3303:
I
nde
n
t
with tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
not
e
s
.
h/c: Pr
o
pagate combine_not
e
s_
f
n return
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
oha
n
Herland
notes
.
h/c:
A
llow c
o
m
b
ine_notes func
t
i
o
ns to
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
c: Reorder fu
n
ctions in preparation for n
e
xt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rl
a
nd
notes
.
h: Make default_notes_ref() availabl
e
in
note
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial
)
n
o
tes
.
h
:
Minor
documentation f
i
xes to c
o
py_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
c:
H
e
x
ify S
H
A1 in die() message from
ini
t
_n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
n
o
te
s
:
D
o
n
't
create (emp
t
y)
c
omm
i
t when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herland
Enable
custom sche
m
es for column colors in the graph
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
M
a
ke graph
_
next_line()
a
v
a
i
la
b
le in
t
h
e
graph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revisio
n
: Turn off histo
r
y simp
l
i
fication in
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
e
visi
o
n: Fix typo
in
--an
c
e
stry
-
p
a
th
e
r
ror message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
Do
c
ume
n
ta
t
ion/rev-l
i
st-
o
ptions
.
t
x
t: Explain --
a
nce
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation
/
rev-list-
o
p
tions
.
t
x
t
:
Fix miss
i
ng line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Her
l
and
d
i
ff
.
c: Ensure "ind
e
x $from
.
.
$to"
line cont
a
ins un
a
mbiguo
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan H
e
rl
a
nd
builtin-notes:
Minor (most
l
y parse_o
p
t
ions-r
e
l
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Her
l
a
n
d
submodule summ
a
ry:
D
on't bar
f
when invok
e
d in an e
m
pty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Add "co
p
y"
s
ubcommand f
o
r copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Misc
.
re
f
a
c
tor
i
ng of
argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes:
A
dd -c/-C op
t
io
n
s
for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
bu
i
ltin-notes: Refacto
r
h
andl
i
ng of -F option to al
l
ow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes:
D
eprecat
e
the -m/-
F
optio
n
s
f
o
r "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Her
l
and
b
u
iltin-notes: Add
"
appe
n
d" subc
o
mmand fo
r
appendi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
b
uil
t
in-notes: Add "add" subcommand
for
adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-not
e
s
: Add --me
s
sage/-
-
file a
l
iases f
o
r -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add "list" su
b
comma
n
d for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
D
o
cumentation: General
i
z
e git-notes docs to 'ob
j
e
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add
"prune"
s
ubcommand for removin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: prune_not
e
s(): P
r
une notes t
h
at belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
t3305: Verify that rem
o
ving note
s
trigger
s
automa
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
builtin-
n
o
t
es: Add
"
remo
v
e" su
b
co
m
mand f
o
r removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Teach builtin-no
t
e
s to
remove empty note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
a
n
d
Teac
h
not
e
s code to properly preserve non-n
o
tes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
t3305:
V
eri
f
y that
adding many notes with
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3301: Verify suc
c
essful a
n
not
a
tion
o
f n
o
n-co
m
m
its
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rlan
d
Built
i
n-ify git
-
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
R
e
factor notes conca
t
enation int
o
a flexible int
e
rface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: Allow
m
ultiple c
o
n
c
urrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API: write_n
o
tes_tree(): St
o
re the no
t
es tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API: for_each_not
e
(
)
: Traverse the entire no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
Not
e
s
A
P
I: get_
n
ote(): Retur
n
th
e
note annotat
i
ng the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
No
t
es AP
I
: remove_
n
ote(): Remo
v
e note obj
e
cts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
Notes
A
PI: add_not
e
(): Add no
t
e object
s
to the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
Notes API:
init_notes(): Initial
i
ze the notes
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Add tests for
c
hecking correct
h
andling of
$
GIT_NOTES_RE
F
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_
c
ommit_notes
(
) -> format_note
(
) + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Minor
c
osmetic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
o
han Herla
n
d
builtin-confi
g
: F
i
x
c
r
as
h
when using "-f <relativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
H
erland
Ad
d
more tes
t
cas
e
s to test fast-import of
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herland
Rename t9
3
01 to t9350, to make
room for
m
ore fast-i
m
p
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
f
a
s
t-imp
o
rt:
P
roper n
o
tes
tr
e
e manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n
Herland
F
ix
c
rasher
on encounteri
n
g SHA1-like
non
-
note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
an Herland
B
a
s
ic
b
u
ild
in
f
r
a
stru
c
t
u
r
e
for Pyt
h
on sc
r
ipts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herl
a
nd
A
d
d sel
f
tests verifying concatena
t
ion of mul
t
i
p
le
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
Refac
t
or notes code to conc
a
tenate multiple notes annota
t
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herla
n
d
Add sel
f
tests verifying
tha
t
we can parse no
t
e
s
t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herlan
d
T
each
t
h
e
n
otes lookup code to p
a
rse
notes tre
e
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
er
l
a
n
d
Tea
c
h
n
o
tes code to
free
i
t
s
in
t
ernal
d
ata
s
tructures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
oh
a
n He
r
land
Add
f
la
g
s to
get_
c
ommit_not
e
s() to control the
f
ormat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next