repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/advice-doc' into maint
2011-11-29
Johan
H
erland
fast-
i
mport: Fix
incorrect fano
u
t level
w
hen modifyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9301: Add 2nd te
s
tc
a
se exp
o
sin
g
bugs
in fast-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an H
e
r
l
a
nd
t9301: Fix testcase
co
v
ering up
a
b
ug in f
a
st-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400
:
F
i
x a couple
o
f
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
r
l
and
Mark dirstat error messages for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
r
l
a
nd
Imp
r
ove error hand
l
ing when parsing d
i
rstat par
a
met
e
rs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
New
-
-
d
irs
t
at=
l
ines mode, doing dirstat analysis base
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Allo
w
specifyi
n
g --d
i
rstat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add c
o
nf
i
g var
i
abl
e
for specifyi
n
g defau
l
t --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herla
n
d
Refactor --dirstat par
s
ing; deprecate --cu
m
ulat
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Make --d
i
r
s
tat=0 outpu
t
directories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
dd several
t
estcases for --dir
s
tat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--d
i
rsta
t
: In case of renames,
use targe
t
file
n
a
me
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Te
a
ch --dirstat n
o
t to c
o
mple
t
ely ignore
r
earrang
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
--dirsta
t
-by-file
:
Make
i
t
f
aster and more corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
--dirstat: Describe non-obv
i
ou
s
di
f
feren
c
e
s relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Her
l
and
Mak
e
"
g
it not
e
s add" more
u
ser-fr
i
e
ndly w
h
en th
e
re
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Her
l
and
lo
g
/pretty
-
options: Document --[no-
]
not
e
s and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joh
a
n
He
r
land
br
a
nch/checkout --tr
a
ck:
Ensur
e
that upst
r
e
a
m bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
pus
h
.
default: Rename 'tr
a
c
kin
g
' to 'u
p
str
e
a
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
l
and
Provide '
g
it merge --abort' as a s
y
nonym to 'g
i
t
reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_
m
erge():
Parse
o
ptions before checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herla
n
d
P
r
ovide 'g
i
t notes
get-ref
'
to ea
s
ily retri
e
v
e current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
git note
s
merge: Add testcases fo
r
merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merge: Add
a
nother
a
u
to-resolv
i
ng strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
git notes m
e
rge
:
-
-
commit should fail if underlyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
nd
git
n
ot
e
s mer
g
e: List conflicting n
o
tes
in notes
m
erge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merg
e
: M
a
nual co
n
flict resolution, part
2
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge:
Manual conflict resoluti
o
n, p
a
rt 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Document
a
tion
:
Pre
l
iminary docs on '
g
it notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
gi
t
note
s
merge: Add automatic confli
c
t
resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t notes merge: Handle
r
ea
l
,
n
on
-
conf
l
i
c
t
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herl
a
nd
bu
i
ltin/notes
.
c: Refacto
r
crea
t
ion of notes
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herl
a
nd
git notes m
e
rg
e
: I
n
itial imple
m
e
n
t
ation h
a
ndlin
g
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erland
builtin/notes
.
c: Spli
t
no
t
es ref DWIMmery into
a s
e
p
arate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
notes
.
c: Use two newlines (in
s
tead of o
n
e) whe
n
co
n
catenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
(
trivial
)
t3303: Indent with tabs inste
a
d of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herland
n
o
tes
.
h/c: Propagate c
o
mbine_notes
_
fn r
e
turn val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
a
n
d
no
t
es
.
h/c
:
Allow combine_
n
otes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
notes
.
c
: Reorder functio
n
s
i
n
preparat
i
on fo
r
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
h: Make default_notes_re
f
() available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
trivial) not
e
s
.
h: Minor docume
n
tati
o
n
fixes to copy_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
c: Hexify SH
A
1 i
n
die() message
fro
m
init_note
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't create
(e
m
pty) commi
t
when removing
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custom sche
m
es fo
r
colum
n
c
olors in the
g
raph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_next_l
i
ne() availab
l
e in the graph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan He
r
land
revision: T
u
rn off histor
y
simplif
i
cation in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix typo i
n
--ancestry
-
path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
Docume
n
ta
t
ion/rev-list-options
.
txt: Explain --anc
e
str
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
Docu
m
entation/re
v
-list-options
.
txt: F
i
x mi
s
s
ing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan He
r
l
and
diff
.
c:
En
s
ure
"ind
e
x $from
.
.
$to" line contains una
m
biguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
built
i
n-
n
otes: Min
o
r (m
o
st
l
y pa
r
s
e_opt
i
on
s
-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an Herland
subm
o
d
u
le summ
a
ry: Don't barf wh
e
n invoked
i
n an
e
mpt
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herla
n
d
bu
i
l
tin
-
not
e
s: A
d
d
"c
o
py
"
subcomma
n
d fo
r
copying not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes: Misc
.
refactoring of argc a
n
d exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-
n
o
t
e
s: Add -c/-C opt
i
ons for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-not
e
s: Refactor handling of -F op
t
ion to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
b
u
iltin-notes: Depre
c
ate the -
m
/-F
options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
bu
i
lti
n
-
n
o
t
e
s: Add "append" subcom
m
and for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
e
r
land
builti
n
-notes: A
d
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 --message/
-
-
f
ile alia
s
es f
o
r -
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
built
i
n
-
notes: A
d
d "li
s
t"
su
b
c
o
mmand for list
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Documen
t
atio
n
: Ge
n
e
r
alize g
i
t-notes d
o
c
s
to
'
o
b
j
e
cts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-n
o
t
e
s: Add
"
p
r
une" su
b
command for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
N
otes API: prune_notes(): Prune notes that
b
e
long to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erl
a
nd
t3305: Verify that
r
e
moving no
t
es trig
g
ers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
o
t
e
s
: Add "remove" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Tea
c
h b
u
iltin
-
notes to
remove empty note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
e
a
ch
notes code to pr
o
perly prese
r
ve non-not
e
s
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
t33
0
5: Ver
i
fy that adding man
y
notes with git-note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
t330
1
:
V
erify successful a
n
notation of non-c
o
mmits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
B
uiltin-
i
fy gi
t
-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor notes concat
e
nation into a fl
e
xible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
A
l
low multi
p
le concurrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: wri
t
e
_
not
e
s
_
tree():
Store the
n
otes
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
n
d
Notes AP
I
: for_e
a
ch_no
t
e():
Tra
v
er
s
e t
h
e ent
i
re notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Not
e
s API: get_
n
ote
(
)
:
Return the note a
n
notating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes AP
I
: remov
e
_note()
:
R
e
move note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes
A
P
I
: a
d
d_note(): Add
note objects to t
h
e internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes
API
:
init_notes
(
):
I
nitia
l
ize the notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Add
t
ests for
checking correct handling of $GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
Notes API: g
e
t_commit_notes
(
) -> format_
n
ote() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
Minor cosm
e
tic
f
i
xes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joha
n
Herland
builtin-conf
i
g: Fix crash when usi
n
g "-f <rela
t
ive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
A
d
d more
t
e
s
tcases to test f
a
st
-
import of no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t
9
301 to t9350
,
to make room for more fast-im
p
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herland
fast
-
impo
r
t: Proper
n
otes t
r
e
e
m
a
nipula
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n H
e
rland
Fix crash
e
r on encountering SHA1-like non-
n
o
t
e in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joh
a
n Herland
B
a
si
c
build infrast
r
uctur
e
for Python s
c
ript
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
Add selftests verifyin
g
c
oncatenati
o
n of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
Herla
n
d
Refactor no
t
es code to
concatenate multiple note
s
annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han
Herland
Add selftests
verifying that we
c
an
parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach the n
o
tes lookup code to parse notes tree
s
wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan
H
erl
a
nd
Tea
c
h
n
otes code t
o
free i
t
s internal
d
ata
s
tructures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herla
n
d
Add fla
g
s to get
_
c
ommit_notes() to
cont
r
ol
th
e
format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
t3302-notes-index-ex
p
ensive: Speed up crea
t
e_
r
epo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
fast-import:
A
d
d support
fo
r
importing commi
t
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
e
rland
Teach
"
-m <ms
g
>" and "
-
F <fil
e
>
" to "g
i
t n
o
te
s
e
dit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git cl
o
ne
:
A
d
d
--recursive
t
o a
u
t
o
matical
l
y checkout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t7407:
U
se '
r
ev-p
a
r
se --
s
hor
t
' r
a
th
e
r than
bash's subst
r
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next