repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
sequencer.c: rework search for start of footer to improve clarity
2012-10-21
Joh
a
n
He
r
l
and
g
it symbolic-ref -
-
de
l
e
t
e $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
Fix fa
i
l
u
r
e to delet
e
a
p
acked ref thr
o
ugh a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-update-ref: A
d
d tes
t
ver
i
fyi
n
g bug
with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
He
r
land
notes-merg
e
: Don't remove
.
g
i
t/NOT
E
S_MER
G
E_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herland
notes-merge: use
opendir/
r
eaddir instead of using read_dir
e
c
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
t3310:
i
l
l
ustra
t
e failure to "notes merg
e
--c
o
mmit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herland
f
a
s
t
-import: Fix incorrect fanout level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
l
and
t
9
30
1
:
Ad
d
2n
d
tes
t
case
exposing bugs in fast
-
imp
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n
Herland
t9301
:
F
ix
test
c
ase covering up a bug in fas
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400
:
Fix a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark
d
irstat e
r
ror me
s
sage
s
f
or
t
ran
s
l
a
tio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herl
a
nd
Improve error handling
w
hen parsing dirstat pa
r
ameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ne
w
--dirstat=lines mo
d
e
, doing dirsta
t
anal
y
sis ba
s
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herla
n
d
Allow
specifying --dirstat cut-off perc
e
ntage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Add config v
a
ri
a
ble
for specifying default -
-
d
irsta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
H
e
r
land
Refac
t
or -
-
dirstat parsing
;
d
e
precate
-
-cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make --dirs
t
at
=
0
o
u
tput
direc
t
ories that contr
i
but
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
d
d
several tes
t
cases for
-
-dirstat
an
d
frien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Herland
--dirsta
t
:
In c
a
s
e
of
r
e
nam
e
s, us
e
target fi
l
ename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach
-
-di
r
st
a
t not to completely igno
r
e re
a
rranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
a
n Herland
--dirstat-by-file: Make it faster and more
c
o
r
r
e
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rl
a
n
d
--
d
irst
a
t: D
e
s
c
r
i
be non-obvious differences r
e
lativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Herland
M
a
ke "git notes add" more user-friendly
w
h
e
n th
e
re
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
erland
log/prett
y
-
o
ptions:
D
ocument --[no
-
]notes and de
p
r
ecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan He
r
land
br
a
nch/che
c
kout --track: Ensure tha
t
upstream bra
n
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Her
l
and
push
.
de
f
ault: Rena
m
e 'tracking' t
o
'u
p
stream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
P
r
o
v
ide 'git merge --ab
o
rt' as
a
sy
n
on
y
m
t
o
'
g
it re
s
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge(): Parse options b
e
fore checking
M
ERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
Provide 'gi
t
n
o
tes get-ref'
t
o ea
s
ily retrieve cu
r
r
ent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
land
g
it notes merge: Add
t
estcases for merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merge: Add anothe
r
auto-r
e
solvi
n
g
stra
t
eg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge: --commit
s
hould fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
git notes merg
e
: List conflicting n
o
tes i
n
notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge: Manu
a
l con
f
lict re
s
olution
,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
n
d
git notes merge: Manual conflict resoluti
o
n
, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation: Preliminary docs on
'
git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t n
o
t
es
merge: Add au
t
omatic confli
c
t reso
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
n
otes merg
e
: Handle
r
eal,
no
n
-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
buil
t
in/notes
.
c
:
R
e
factor
creation of notes commit
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herlan
d
git notes merge:
I
n
i
tial implem
e
ntation handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
builtin/no
t
es
.
c:
Split notes re
f
DWIMm
e
ry
in
t
o a
s
e
para
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
an
d
n
ot
e
s
.
c: Us
e
two ne
w
lines
(instead o
f
one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erl
a
n
d
(trivial) t3303:
I
ndent with tabs
i
nstead of s
p
aces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c
:
Pr
o
p
agat
e
comb
i
n
e
_notes_fn
r
e
t
urn v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
h/c: A
l
low
c
ombine_n
o
tes functions to
remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Reor
d
e
r
fun
c
ti
o
ns in
p
re
p
aration for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
h: Make
d
e
fault_not
e
s_ref()
a
vailable in notes
A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
t
ri
v
ial
)
notes
.
h: Minor doc
u
ment
a
tion fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c: Hexi
f
y SHA1
i
n die()
message from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
o
han Herland
notes: Don't
create (empty) commit when r
e
m
oving n
o
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
E
n
able
custom
s
chemes for column col
o
rs i
n
the graph
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Her
l
and
Make gr
a
ph_nex
t
_line(
)
ava
i
lable i
n
the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Her
l
and
rev
i
s
ion: Turn off history simplification in
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
on: Fix
typ
o
in --a
n
ces
t
ry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
D
ocume
n
tation/rev-list-options
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herlan
d
Documentation/
r
ev
-
list-options
.
t
x
t
:
Fix
m
issing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
han Herland
di
f
f
.
c: Ensure
"
i
n
dex $fr
o
m
.
.
$to"
l
ine c
o
nta
i
n
s una
m
bigu
o
us
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herlan
d
bu
i
l
t
in-notes: Minor (mostly par
s
e
_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
s
u
bm
o
d
ule summ
a
ry:
Do
n
't barf
when invoked
i
n an emp
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-notes: Ad
d
"
c
opy" subcommand
for co
p
y
i
ng
n
ote
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-not
e
s:
Misc
.
r
e
f
act
o
ring of argc and ex
i
t value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin
-
notes: Add -c/-C opt
i
ons for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
e
s:
R
efac
t
or handling of -F option to allo
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: 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
builtin-no
t
es: Add "append"
subcommand
f
or ap
p
endin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
bu
i
lt
i
n
-n
o
t
es: Add "add" subcommand
f
or adding
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
builtin-notes:
A
dd --mess
a
ge/--file alia
s
es for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
buil
t
i
n
-note
s
:
Ad
d
"list" su
b
command for
l
isting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Docum
e
ntation
:
Generalize git-notes
docs to
'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
uiltin-notes: Add "prune" subc
o
mm
a
nd for
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: pru
n
e_
n
otes()
:
Prune no
t
es
t
hat belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
305:
Verify that
r
emo
v
ing n
o
tes
trigg
e
rs automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
built
i
n-notes: Add "r
e
move" subcom
m
and
f
or removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
Teach builtin-not
e
s to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Te
a
ch
n
o
tes code to properly prese
r
ve non-note
s
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify that
addin
g
man
y
notes with
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t330
1
:
Ver
i
fy su
c
c
essful a
n
n
ot
a
tion of n
o
n-commi
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Builtin
-
ify git-
n
ote
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor notes
concate
n
at
i
o
n
i
nto
a
flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
Notes
A
PI: Al
l
ow multiple c
o
ncurrent notes trees
w
it
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Her
l
and
N
o
tes API: wri
t
e_no
t
es_tre
e
(): S
t
ore t
h
e notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes AP
I
: f
o
r_each_note(): Traver
s
e the entire not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
Note
s
API: g
e
t_note(): Return the
n
ote annota
t
ing the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s
A
PI: remove_note():
R
e
move note objects fro
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: ad
d
_no
t
e():
Add no
t
e o
b
jects to
the inte
r
n
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
N
o
tes API: init_notes
(
): Init
i
alize the no
t
es tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
Add tests
f
or
c
heck
i
ng
cor
r
ect handling of
$
GIT_N
O
T
ES_
R
EF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
H
erland
No
t
es
A
P
I: get_co
m
mit_notes() -> fo
r
mat_note
(
)
+ r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmetic fixes to
n
otes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joh
a
n Her
l
and
bui
l
tin-con
f
ig: Fix cras
h
wh
e
n usin
g
"-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add mo
r
e testcase
s
t
o
te
s
t fast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9
3
01
t
o t
9
350, to make
room for more
fast-im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-import: Prop
e
r not
e
s tree manipul
a
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix crasher on encount
e
ring SHA1-like non
-
note in n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joh
a
n He
r
land
Basic bu
i
ld infrastructur
e
f
or Python scri
p
ts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add selftests
v
erifying concatenation of multipl
e
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refactor notes code to conc
a
tenate multip
l
e not
e
s
a
nnotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add se
l
ftests ver
i
fying 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 notes lookup code to parse no
t
es trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
Teach
notes cod
e
t
o
free
i
ts in
t
ernal da
t
a
s
tructur
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next