repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ci/stripspace-docs' into maint
2011-11-29
Johan Herland
fast
-
impo
r
t: F
i
x incorrect fanout
l
evel w
h
e
n
m
o
difying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9
301:
A
d
d
2nd testcase exposing bugs in fa
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
er
l
and
t
9301: Fix testc
a
se
c
over
i
ng u
p
a bug in fast-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herla
n
d
t
5
400: Fix a
couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dirstat e
r
ror messages
fo
r
translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve error handling when parsing
dirstat paramet
e
rs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --d
i
rstat=lines mode, doi
n
g dirstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Allow specifyin
g
--dirstat cut-o
f
f perc
e
ntag
e
as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Add con
f
ig v
a
riabl
e
for
specifying d
e
fault --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an He
r
land
Refactor
--di
r
s
t
at
p
arsing;
deprecate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan H
e
rland
Make --dirstat=
0
output director
i
es that co
n
tribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several
testca
s
e
s
for --dirstat and
f
rien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
-
-dirst
a
t: I
n
case of renames, use ta
r
g
et file
n
ame
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dirst
a
t not to comple
t
ely igno
r
e r
e
arran
g
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
--dirsta
t
-by-file: Make it f
a
s
t
er and more co
r
rect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
--dirstat: De
s
cribe non-
o
bv
i
ous difference
s
rela
t
ive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git notes add" more
user-friendly when
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
Herland
log/pret
t
y-
o
ptio
n
s
:
D
o
cum
e
nt --[no-]notes and
d
ep
r
ecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan He
r
la
n
d
branch/check
o
ut --tra
c
k
:
Ensure that up
s
tream
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
H
erland
push
.
defau
l
t: Rename 'tracking' to 'upstr
e
am'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge --abo
r
t
'
as
a synonym to '
g
i
t reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge(): Parse options befo
r
e ch
e
cking MER
G
E_H
E
AD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Provide 'git not
e
s get-ref' to
e
asily
retrieve curren
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merge: Add test
c
ases for
merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge: A
d
d a
n
o
t
h
er auto-resolving st
r
at
e
gy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes merg
e
: -
-
c
om
m
it
s
hould
f
ai
l
if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
git
notes
mer
g
e: L
i
st conflicting notes
in notes merg
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Her
l
and
g
i
t
notes merge: Manual conflict resolu
t
ion
,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
git notes merge: Man
u
al
conflict re
s
oluti
o
n, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docu
m
entatio
n
:
P
relimi
n
ary
docs
o
n 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge
:
Add auto
m
atic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes m
e
rge: Handle r
e
al, non-conflict
i
ng
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
buil
t
in/no
t
es
.
c
: R
e
f
acto
r
creation of notes
comm
i
ts
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
e
rland
git notes merge: Initia
l
imple
m
ent
a
tion handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erlan
d
builtin/notes
.
c: Spli
t
notes ref
D
W
I
Mmery into a separat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
tes
.
c: Use t
w
o newlines (i
n
stead
o
f o
n
e) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(
t
rivial) t
3
303: In
d
ent
with tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
otes
.
h/c: Pr
o
pagate combine_
n
otes
_
fn re
t
urn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
h
/c: Allow
c
ombine_note
s
fu
n
ctions to re
m
o
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
ha
n
H
e
r
land
note
s
.
c:
R
eorder
f
unctio
n
s in prep
a
ration
for ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
h: M
a
ke default_no
t
es_ref(
)
availab
l
e
i
n
no
t
es API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
(trivial) n
o
tes
.
h: Minor docume
n
tation fixes
t
o
co
p
y_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
c: Hexif
y
SHA1 in die() message f
r
o
m
init_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes:
D
on't
c
r
eate (empty) c
o
m
m
i
t
when
r
em
o
vi
n
g non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
Enable custom
s
chemes
for column col
o
r
s
in the graph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herland
Make graph_next_
l
ine()
a
vai
l
able in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
rev
i
sion: Turn off history simplification in --a
n
cestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
rev
i
sion: Fi
x
ty
p
o in --ancestry
-
path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docu
m
entat
i
on/rev-list-options
.
txt:
E
x
p
lain
-
-
a
ncestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herlan
d
D
o
cum
e
n
t
ation
/
rev-list-options
.
tx
t
: Fi
x
missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herland
dif
f
.
c:
E
n
sure "
i
ndex $
f
rom
.
.
$
t
o" line conta
i
ns un
a
mb
i
guous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
H
e
r
land
bui
l
tin-notes: Minor (mostly par
s
e_
o
ptions-relat
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
submodule sum
m
ary: Don't b
a
rf when
invoked in an emp
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Add "copy" subcommand for copy
i
n
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-notes: Misc
.
refactori
n
g of arg
c
and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-no
t
es:
A
dd -c/-C options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
builtin
-
not
e
s:
Refactor handling o
f
-F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
ti
n
-notes
:
Dep
r
eca
t
e the -m/-F options
for "g
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
an
d
builtin-notes: Add
"app
e
nd" subcom
m
a
nd for
a
ppendi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
builtin-notes:
A
dd "add" subco
m
m
a
nd
f
o
r ad
d
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
bu
i
ltin-note
s
: Add --message/-
-
file a
l
i
a
ses
f
o
r -
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
ilti
n
-notes: Add "list" s
u
bcommand for
listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Documentation: Generalize
git-notes docs
t
o 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
builtin-notes: Add "pr
u
ne" su
b
command for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
N
otes API: prune_not
e
s()
:
Prune notes that b
e
long to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t33
0
5: Verify
t
hat removing notes trigg
e
rs automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add
"
remove" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Her
l
and
Teach built
i
n-notes to remove empty no
t
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
e
ach notes
code to
prope
r
l
y preserve non-not
e
s in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t
3305: Ve
r
ify that adding many
notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
t3301: Verif
y
successfu
l
annot
a
tion of non-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
Refac
t
or notes conca
t
en
a
t
ion into a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
No
t
es API: Al
l
ow multiple con
c
urrent no
t
es tree
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
N
o
tes A
P
I: write
_
no
t
es_tree(
)
: Store
t
he
notes
t
re
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API: for_each_no
t
e(): Traverse the entire not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
N
o
t
e
s API: g
e
t_note(): Return t
h
e
note
a
nnotating t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: r
e
move
_
note(): Re
m
ov
e
note ob
j
ects
f
rom
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API
:
add_note(): Add note objects to
the inte
r
nal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes
API:
init_n
o
tes(): I
n
itiali
z
e the notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
Ad
d
tests
f
or checking correct h
a
ndli
n
g of $GIT
_
NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
o
tes API: get_com
m
i
t
_notes()
-> format_not
e
(
) + r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
and
Minor
cosme
t
ic fixes
to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herla
n
d
buil
t
in
-
c
o
nfig: Fi
x
cr
a
sh when
usi
n
g
"
-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
a
n
He
r
land
Add mo
r
e
t
estcases to test fast-import o
f
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
R
e
name t9301 to t93
5
0
,
to mak
e
room for more fas
t
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herland
fa
s
t-impo
r
t: Proper notes tree
manipul
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Jo
h
an H
e
rland
Fix
c
ra
s
her on encount
e
r
i
n
g SHA1-like non-
n
o
te in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herlan
d
B
a
sic build
i
nfrastruct
u
re for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Add sel
f
tests
v
erifying concatenation of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Refactor
notes co
d
e
to c
o
ncatenate multiple notes annota
t
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han
H
e
r
l
and
Add
s
elf
t
ests ve
r
ifying that we can parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Tea
c
h t
h
e notes lookup code to par
s
e notes tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach notes code to fre
e
its
i
nte
r
nal data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
A
d
d
flags to get_comm
i
t_
n
o
t
e
s
()
to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han
He
r
l
and
t33
0
2
-notes
-
index-exp
e
nsive: Speed up cre
a
te_rep
o
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fast-import: Add support
for im
p
orti
n
g commit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Tea
c
h
"-m
<msg
>
" and "-F <file>" to "git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herlan
d
gi
t
clone: Add --recursive to
automatical
l
y checko
u
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t7407: U
s
e 'r
e
v-parse --short
'
r
ather
tha
n
bash's sub
s
tri
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next