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
t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
2011-11-29
Joh
a
n Her
l
and
t9301: A
d
d 2nd
t
est
c
ase e
x
p
osing bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n He
r
lan
d
t930
1
:
Fix t
e
s
t
c
ase cover
i
n
g up a bug
i
n
fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an
Herla
n
d
t5400: Fix a coup
l
e of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herlan
d
Mark dir
s
tat error m
e
ssages for translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
I
m
prove
error
hand
l
i
n
g when par
s
ing dirstat parame
t
ers
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n
Herl
a
n
d
N
e
w --dirstat=lines mode,
doing dirstat analysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Her
l
and
Allow
speci
f
ying --dirstat cut-off percen
t
age as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Her
l
and
Add confi
g
v
a
riable for specifying default -
-
dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Refac
t
or --dirstat parsing; depr
e
cate --cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
Make --dirstat=0 output directories
th
a
t contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Add
s
e
v
era
l
te
s
tcases for --dir
s
tat and f
r
iends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Her
l
and
--d
i
rstat:
I
n case of
renames, use t
a
rg
e
t fi
l
ename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
T
each
-
-dirs
t
a
t
not to comple
t
el
y
i
gnore re
a
r
ra
n
ged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan
Herland
--dirst
a
t-by-file:
M
a
k
e it f
a
st
e
r
a
nd mo
r
e correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erlan
d
--dirstat: De
s
c
r
ibe no
n
-ob
v
ious differences relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan H
e
rland
Ma
k
e "git notes
add
"
more user-f
r
iendl
y
wh
e
n
t
here
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herlan
d
log/pretty
-
option
s
:
Docu
m
ent --[no-]notes
a
nd deprec
a
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checkout -
-
tra
c
k: Ensure t
h
at upstr
e
a
m
branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan H
e
rland
push
.
default: Rename 'tracking' to 'upstream
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Provide 'git merge
-
-abort'
as
a
synon
y
m to 'git
reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
c
m
d
_
merge(): P
a
rse
o
ption
s
bef
o
re
check
i
n
g MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Provide 'git notes get-ref' to easily retrie
v
e
c
urren
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
g
i
t
n
otes
merge: Add t
e
s
t
cases for merg
i
ng not
e
s trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
rland
git notes
m
erge: Add another auto
-
resolving st
r
ategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
g
i
t
notes
merge: --com
m
it s
h
ould fa
i
l
if under
l
ying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herlan
d
g
i
t
note
s
merge:
List conf
l
icting notes in notes m
e
rge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es merge: Manual co
n
fl
i
ct re
s
olution, part 2
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
n
o
t
es merge: Man
u
al conflict reso
l
ution, p
a
rt 1/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
H
erla
n
d
D
o
c
umentation: P
r
eliminar
y
docs on 'git
notes
m
erge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git not
e
s merge: Add aut
o
m
a
tic conflict reso
l
vers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
rl
a
nd
git
n
otes me
r
ge: Handle
r
eal, n
o
n-conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
r
l
and
builtin/note
s
.
c: Refactor cre
a
ti
o
n of notes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
I
nit
i
al
i
mplementation handling trivia
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
builtin
/
no
t
es
.
c
:
Split notes r
e
f
DWI
M
m
e
ry into a separat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
c: Use t
w
o newlines (instead
o
f o
n
e)
w
hen
c
o
n
catenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(trivial)
t3303: Indent
w
ith
t
abs instead o
f
spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
n
otes
.
h/c:
Propagate combine_not
e
s_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
h/c:
Allow combin
e
_notes f
u
nctions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
n
o
t
e
s
.
c: Reorder
f
unctions
i
n
p
repara
t
ion for
n
ex
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
h: Make defaul
t
_notes_r
e
f(
)
available
in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial
)
notes
.
h
:
Minor docu
m
entat
i
o
n fixes
t
o
co
p
y
_note
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hexi
f
y
SH
A
1 in die(
)
m
e
s
sage fr
o
m i
n
it_notes
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't
c
reate (empty) commit when removing no
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
E
nable
custom
s
c
h
e
m
es for column colors in t
h
e g
r
aph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
Make
g
raph_n
e
xt_l
i
ne() availa
b
le in the graph
.
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
re
v
ision:
T
u
r
n off hist
o
ry simpl
i
fica
t
ion in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
He
r
la
n
d
revision: Fix
typo
i
n --a
n
ce
s
try-p
a
th e
r
ror mess
a
ge
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documen
t
ation
/
rev-list-options
.
txt: Explain --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
Documentatio
n
/rev-li
s
t-options
.
t
xt: Fix mis
s
i
n
g line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
J
oha
n
H
e
rland
diff
.
c
:
Ensure "inde
x
$from
.
.
$
t
o" line co
n
t
ai
n
s una
m
b
i
guous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
b
u
iltin-no
t
es:
Minor
(
mostly parse_options-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an Herland
subm
o
d
u
le summa
r
y: Don't ba
r
f when invoked in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd "copy
"
subcomma
n
d
for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Misc
.
refactori
n
g of
a
rgc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-not
e
s:
A
dd -c/-C options for reusing
n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
b
uiltin
-
notes: Refactor
ha
n
dl
i
ng of -F option to
a
ll
o
w
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes
:
Deprecate the -m/-F options for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
b
u
iltin-notes:
Add "append" subcomma
n
d for ap
p
ending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
bui
l
t
in-notes:
Ad
d
"add" subcommand for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
Add
-
-me
s
sa
g
e
/--fi
l
e
aliases fo
r
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
built
i
n-
n
otes: Add "list" su
b
c
ommand for
l
i
sting note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Documentation: Gener
a
lize git-not
e
s docs to
'
objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
bui
l
tin-notes:
A
dd
"p
r
une"
subc
o
mmand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
Note
s
API: prune_notes(): Prune not
e
s that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
t
3305
:
Verify tha
t
remov
i
ng notes tr
i
ggers a
u
tomatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
b
u
iltin-notes: Add
"re
m
ove"
subc
o
mmand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Teach b
u
i
l
t
in-notes to remove
empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
each
notes code to properly
p
reser
v
e
non-not
e
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify th
a
t
a
dd
i
ng many notes with git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
t
3301: Verify succ
e
ssful annotation o
f
non
-
commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
Builtin-ify git-not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Refact
o
r
notes
c
oncatenation into a flexible
i
nt
e
rfa
c
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s
AP
I
:
Allow multiple conc
u
rrent notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
N
otes
A
PI: wr
i
t
e
_
n
otes_tree(): St
o
r
e
the not
e
s t
r
e
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
for_each_note
(
): Traverse the enti
r
e
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API
:
get_note(): Ret
u
r
n
the note annot
a
t
i
ng the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Note
s
API: r
e
move_note(): Remov
e
note o
b
jec
t
s f
r
om
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes
A
PI: add_note(): Add note obj
e
ct
s
to the
i
n
ter
n
al
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API
:
ini
t
_notes():
Init
i
alize the notes
tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
A
dd
tests f
o
r checking correc
t
handli
n
g of $
G
I
T
_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
er
l
and
Notes API: get_c
o
mmit_notes() -> format_note
(
) + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
Minor co
s
metic fixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-c
o
nfig
:
Fix crash when using "-f <rela
t
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add more testcases to
test fast
-
import
of not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erland
Rename t9301 to t93
5
0,
to make room for mo
r
e
fast-imp
o
rt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
f
a
st-
i
m
p
ort: Proper notes tree manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herla
n
d
Fi
x
crasher on encounteri
n
g SHA1-like non
-
no
t
e in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
B
asic build infrastru
c
ture for Pytho
n
s
c
r
ipts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erla
n
d
Add
selftests verifying co
n
c
atena
t
ion o
f
multiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
Herland
Refactor no
t
es code to conca
t
enate multiple notes annotating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Add selftests verifyi
n
g
th
a
t
we can parse
n
o
tes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Teach
the notes l
o
o
kup code to pars
e
n
o
t
es tr
e
es with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
la
n
d
Teach notes code to fre
e
its
i
n
ternal data structures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add fl
a
g
s
to
g
e
t_commit
_
n
ote
s
() to control the f
o
rmat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
t
330
2
-note
s
-
i
ndex
-
e
x
p
en
s
i
v
e
: Speed u
p
create
_
re
p
o()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fa
s
t-import: Add
support for importing commit note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach "-m <msg>
"
a
nd
"-F
<file>" to "git n
o
tes edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan H
e
rland
g
it clone:
Add --recur
s
ive to auto
m
atical
l
y chec
k
out
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t
7
4
07: Use 'rev-
p
arse --short' rather than b
a
sh's
s
ubstr
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n Herland
g
it submodule status: Add --recursive t
o
recu
r
se into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next