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
t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
2012-10-21
Johan He
r
land
t1400-update-
r
ef: Add te
s
t
v
erifying bug wi
t
h symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: Don't rem
o
ve
.
git/NOTES_ME
R
GE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n Herland
notes-merge: use
op
e
n
d
ir/readdir i
n
stead of usi
n
g rea
d
_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: illustrate failure to "no
t
es merge --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
r
l
a
n
d
fa
s
t-im
p
ort: Fix
i
n
c
o
r
rect fanout level
w
hen modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
t930
1
:
Add 2nd t
e
stca
s
e
ex
p
o
s
ing bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
t9301: Fix te
s
tcase covering up a
b
ug in fast-impo
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
erland
t5400: Fix a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
Herland
Mark d
i
rs
t
at error me
s
sages for translat
i
o
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
erland
Improve er
r
or han
d
ling when pa
r
sing dirs
t
at pa
r
am
e
ter
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rla
n
d
New -
-
dirst
a
t=
l
ines mode, doing dirstat anal
y
si
s
based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow
s
peci
f
yi
n
g
--dirsta
t
cut
-
off percentage as
a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
Add
config
variable for specify
i
ng defau
l
t --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Refact
o
r --dirstat parsing; d
e
preca
t
e
--
c
umulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rla
n
d
Make --di
r
stat
=
0
output directories that contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
A
dd seve
r
al testcas
e
s
f
o
r
--dirstat and
f
rie
n
ds
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Her
l
and
--dirstat:
In case of ren
a
mes, use target fi
l
e
n
ame
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dirstat not to compl
e
t
e
ly ignore
rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
--dirstat-by-file:
Mak
e
it
fas
t
e
r
and
more correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
--dirstat: Describe non-obviou
s
dif
f
er
e
nces relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n
H
erland
Make "git notes add" more user-friendly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty-
o
ptions: Document --[no-]n
o
tes
and depreca
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han
Her
l
and
branch/ch
e
ckout --trac
k
: Ens
u
re that upstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
defaul
t
: Ren
a
me 'trackin
g
'
to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Pr
o
vide 'g
i
t merge --abort' as
a synonym to
'
git
r
e
s
et
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge(): Pars
e
option
s
bef
o
r
e
checking ME
R
GE
_
HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Prov
i
de 'git no
t
es get-ref
'
t
o
ea
s
ily re
t
r
i
e
ve cu
r
r
e
nt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes merge: Add tes
t
c
a
ses
fo
r
merg
i
ng not
e
s trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
g
i
t notes
merg
e
: Add another auto-resolv
i
ng strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
i
t notes merge: --com
m
i
t should
fail if und
e
r
lying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git
n
otes me
r
g
e: List co
n
flictin
g
no
t
es in n
o
tes me
r
ge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git not
e
s merge: Manual conflict resolution, pa
r
t
2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
me
r
ge: Manua
l
con
f
lict
resolut
i
on, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation
:
Preliminary docs
o
n '
g
it notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git note
s
merge
:
Add automat
i
c confl
i
c
t resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it no
t
es me
r
ge: Ha
n
dle
real
,
non-conflict
i
ng no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bui
l
ti
n
/notes
.
c: Refactor creation
o
f not
e
s
c
omm
i
t
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
i
t
n
otes merge: Initial
i
m
p
lementation handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
builtin/notes
.
c
:
S
pl
i
t notes re
f
DWIMmery int
o
a
s
eparate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
notes
.
c: U
s
e
t
wo newlines (i
n
s
t
e
a
d of one) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(trivial) t3303: Inden
t
wi
t
h
tabs in
s
tead of spac
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
notes
.
h/c: P
r
opagate
c
ombine_notes
_
fn r
e
tur
n
valu
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c:
Allow
c
ombi
n
e_not
e
s functions t
o
remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
notes
.
c: Reorder functions
in preparatio
n
for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n
Herland
notes
.
h: Make default_notes_ref() availab
l
e in note
s
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivia
l
) notes
.
h
: Mino
r
documenta
t
ion fixes to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Her
l
an
d
notes
.
c: H
e
x
i
fy SH
A
1 in di
e
() mess
a
ge f
r
om init_
n
otes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan He
r
land
notes:
D
on't
c
rea
t
e (
e
mpty) com
m
it w
h
en
removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
Enable
custom s
c
hemes for col
u
mn co
l
ors i
n
the grap
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_
n
ext_line() a
v
ailable i
n
the graph
.
h A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revi
s
ion: Turn o
f
f history simplification
in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
revision: Fix typo
i
n --ancestry-path er
r
or
m
essa
g
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
umentation/rev
-
list-
o
ptions
.
txt:
Exp
l
ain
-
-anc
e
stry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herla
n
d
Documentation/rev-list-option
s
.
txt: Fi
x
mis
s
ing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c:
E
nsure "index $f
r
o
m
.
.
$t
o
" l
i
ne contains unambigu
o
us
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
b
u
iltin-notes: Mi
n
or (mostly pa
r
s
e
_options-relate
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han He
r
land
s
ubmodule sum
m
a
ry: Don't b
a
rf when invoke
d
in an emp
t
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin
-
no
t
e
s
: Add "copy" subcommand
f
or
c
o
pying
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
builtin-notes
:
Misc
.
r
ef
a
ctori
n
g of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
buil
t
in-notes: Add -
c
/-C o
p
tions for reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builti
n
-
n
otes: Refact
o
r
h
andling of -
F
option to
a
llow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
b
uiltin-n
o
t
es: Deprecate the -m/-F options
f
o
r
"
git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
bui
l
t
in-notes: Add "a
p
pend" subcommand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Add "add" subcommand
f
or addin
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
bu
i
l
t
in-no
t
e
s
: Add --me
s
sage/-
-
f
ile aliases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bu
i
l
tin-
n
otes
:
Add "lis
t
" subcommand for list
i
ng note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentation: G
e
neralize git-notes docs to
'o
b
jects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
builtin-notes: Add "
p
ru
n
e" subcom
m
and for removi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
N
o
tes A
P
I: prune_notes():
P
rune
notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t3305:
V
erify that remov
i
ng notes
t
riggers autom
a
t
ic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
built
i
n-notes
:
A
dd "r
e
move" subcommand fo
r
rem
o
vin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Teac
h
bui
l
tin-notes to re
m
ove
e
m
p
ty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
T
e
ach notes code to properly p
r
eserve
non-notes i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t3305: Verify tha
t
add
i
n
g
m
a
ny n
o
tes
with git-
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301:
Ve
r
ify successful annotation of non-c
o
mmits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Builtin
-
i
f
y gi
t
-n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
Refact
o
r notes
c
oncatenation into a fl
e
xible
i
n
t
e
r
face
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API:
Allow
multiple concurrent
notes trees
with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
Notes A
P
I: write_n
o
tes_tree(
)
: S
t
ore the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
N
o
te
s
A
PI:
for_each_
n
ot
e
(
): Trave
r
se the entire
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
Notes API
:
get_not
e
()
:
Return the note annotating th
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rla
n
d
N
ote
s
API
:
remove_note(): Remove note objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
No
t
es API:
a
dd_note(): Add no
t
e objects to
t
h
e internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
Notes API: init_notes(): Ini
t
ialize t
h
e notes t
r
ee
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Add tests for
c
hecking
co
r
re
c
t
h
andling of $GI
T
_
N
OT
E
S_R
E
F
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
Notes API: get_
c
o
mmit_note
s
() -
>
format_note()
+
re
m
o
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Mi
n
or cosmetic f
i
xes to
n
otes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Joh
a
n Herland
builtin-config: Fix crash
w
hen using "-f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n
Herland
A
dd
m
ore testcase
s
to te
s
t fast
-
imp
o
rt of
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan He
r
lan
d
R
e
na
m
e t9301 to t9350,
t
o
m
a
k
e
room for
more fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herland
fa
s
t
-import: P
r
oper notes
t
ree manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix
c
rash
e
r
on en
c
ou
n
t
e
ri
n
g SHA1-like non-note in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic build infrastructure for P
y
thon scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Ad
d
s
elftest
s
ve
r
ifyin
g
concatenation of mu
l
tiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
He
r
land
R
ef
a
ctor notes code t
o
conc
a
tenate mult
i
ple
notes annotating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Add selftests verifying that we can pa
r
se notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
er
l
and
Te
a
ch the note
s
lookup code to parse
notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Teach notes c
o
de to free its in
t
e
rna
l
data structu
r
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Add
flags to g
e
t_commit_notes() to contro
l
the f
o
rmat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
t3302-notes
-
index-expen
s
i
ve
:
Speed up create_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next