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 'mh/notes-string-list'
2012-10-21
Jo
h
an Her
l
an
d
g
i
t
s
ymbolic-r
e
f --dele
t
e $sy
m
r
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
note
s
-
m
erge:
D
on't r
e
move
.
g
i
t/NOTES_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: use opendir/re
a
ddi
r
instead of using read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310: illustrate
failure to "note
s
merge --co
m
mit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
fast-import: Fix incorrect f
a
nout level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
oh
a
n Herland
t9301: Add 2nd
t
es
t
case exposing bugs in f
a
st-
i
mpor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
t9
3
01:
F
i
x testcase cover
i
n
g u
p
a
bug i
n
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rland
t5
4
00: Fix a co
u
ple of t
y
pos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Mark dirs
t
at e
r
ror
m
e
ssages for tra
n
slation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herlan
d
I
m
p
r
ove error handling whe
n
p
a
r
s
in
g
dir
s
tat para
m
eters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
New --dirstat=line
s
mode, d
o
ing dirstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specifying --dirstat
c
ut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Add config
v
ari
a
ble for specify
i
ng defa
u
lt --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
nd
R
ef
a
ctor --
d
i
rst
a
t
p
a
r
sin
g
; d
e
prec
a
t
e --c
u
m
u
lati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
r
land
Mak
e
--dirstat=0 output directories th
a
t contr
i
bute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
s
ever
a
l tes
t
cases
f
or
-
-
d
ir
s
tat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat:
I
n case
o
f
renam
e
s, us
e
target f
i
lename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han He
r
la
n
d
Te
a
ch --dirstat no
t
t
o com
p
letely ign
o
re rearra
n
g
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
-
-di
r
st
a
t
-by-file: Make it faster a
n
d mor
e
correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--di
r
stat: Descri
b
e non-
o
bvio
u
s differen
c
e
s relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
M
a
k
e
"
git
n
o
te
s
add" mo
r
e user-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
e
rl
a
nd
log/pretty-optio
n
s: Doc
u
men
t
--[no-]notes and depr
e
c
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
erland
branc
h
/checkout -
-
track: Ensure that up
s
tream bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default: Rename 't
r
acking' to 'u
p
stream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'gi
t
m
e
rge --abort
'
as
a
s
ynonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
cmd_me
r
g
e
(): P
a
r
se options
b
e
f
ore checking
M
E
R
GE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
H
erla
n
d
Provide 'git n
o
tes get-r
e
f' to
e
a
sily re
t
riev
e
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
lan
d
git notes
merge: Ad
d
testcases fo
r
merging
notes
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
notes
me
r
g
e: Ad
d
another auto
-
re
s
olving strate
g
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
nd
git notes merge: --commit should
f
a
il if unde
r
l
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes mer
g
e:
List con
f
l
icting notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merg
e
: Manu
a
l co
n
flict r
e
s
o
lution, part 2/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manual conflict resolutio
n
,
part 1/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
Documentation:
Prelimi
n
a
r
y
docs on
'g
i
t no
t
es merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
gi
t
notes merge: Add automatic co
n
flict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
git
n
o
tes m
e
rge: Handl
e
real, n
o
n-conflicting
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
built
i
n/notes
.
c: Refact
o
r creation of
n
otes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
git no
t
es m
e
rge: Ini
t
ia
l
imp
l
emen
t
ation
h
andling tri
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
builtin/notes
.
c: Spl
i
t notes ref DWIMmery in
t
o a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
not
e
s
.
c
:
Use two n
e
wlines (instead of on
e
) when con
c
atena
t
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
(trivial
)
t3303
:
Indent w
i
t
h tabs inst
e
ad
o
f spac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
l
a
nd
n
o
t
es
.
h
/c: Propagate com
b
ine_n
o
t
es_fn
r
e
turn
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
note
s
.
h/c: Allow c
o
mbine_notes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
c: Re
o
rder functions in
p
reparation for n
e
xt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han He
r
land
n
otes
.
h: Make default_notes_r
e
f() a
v
ailable in not
e
s API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
(
t
rivial) not
e
s
.
h: Minor do
c
umentatio
n
fixes t
o
cop
y
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herla
n
d
note
s
.
c: Hexify SHA1 in die() m
e
ssage from
i
nit_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan Herland
n
o
t
es: Don't create (e
m
pty
)
commit w
h
en removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custom scheme
s
for column
c
olors in t
h
e
g
raph AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Mak
e
g
raph_next_line() available i
n
the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revi
s
ion: Turn off
h
i
s
tor
y
simplif
i
cation in
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
r
e
v
ision:
F
ix ty
p
o
i
n
--ancestry-
p
ath
error messag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an H
e
r
land
Do
c
umentation/rev-list-options
.
txt: E
x
plain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
Documentat
i
on/rev-list-opt
i
ons
.
txt: Fix mis
s
i
ng line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan He
r
land
diff
.
c
:
Ensure
"i
n
dex $from
.
.
$to" line contains unambi
g
uous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
b
u
iltin-n
o
tes: M
i
n
or (m
o
stl
y
parse_opti
o
ns-relat
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submod
u
l
e
s
ummary: Don't barf when inv
o
ke
d
in
a
n empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-not
e
s:
Add "copy" subco
m
mand
for
c
opyi
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
builtin-notes: Misc
.
refactor
i
ng of argc and exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
u
i
l
t
in-no
t
es: Ad
d
-c/
-
C options
for reusi
n
g notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
builtin-notes: Refactor handling
o
f
-F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-no
t
e
s
: Deprecate t
h
e
-m/-F opti
o
ns for "
g
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
l
and
b
uiltin-note
s
: Add "a
p
pend
"
s
u
bcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
b
ui
l
tin-notes: Add
"
a
dd"
s
ubcommand for addin
g
n
ote
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-no
t
es: Add
--mess
a
g
e
/-
-
f
i
le aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add "list" subc
o
mmand f
o
r listin
g
n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rland
D
ocu
m
entat
i
on: Generalize
git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builti
n
-notes:
A
dd "prune"
su
b
comman
d
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s
API
:
p
rune_notes(): Pr
u
ne n
o
te
s
tha
t
belon
g
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
t3305: Ve
r
i
fy that re
m
oving notes trigg
e
rs
a
utomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
lan
d
builtin-notes: A
d
d "remove"
sub
c
om
m
a
n
d for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
b
uilt
i
n
-
no
t
es to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
T
each not
e
s co
d
e to properly preserve
non-
n
otes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t3305: Verify that adding ma
n
y
note
s
with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
t3301: Ver
i
fy succ
e
s
sful an
n
ota
t
ion
o
f non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
B
u
ilti
n
-ify
g
i
t
-
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Refactor notes c
o
ncaten
a
tion into a
flexible interfa
c
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: All
o
w m
u
ltiple
concurrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API
:
write_notes_tree(): Store the notes t
r
ee
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Not
e
s AP
I
: for_each
_
not
e
(): Traverse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: get_
n
o
te
(
):
Return th
e
not
e
ann
o
tat
i
ng the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes A
P
I
:
remove_
n
ot
e
():
Remove note objec
t
s
f
ro
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes
API: add_note():
A
d
d not
e
obj
e
c
t
s to the intern
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
Notes API: i
n
it_n
o
tes(
)
: I
n
itializ
e
t
h
e notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
l
and
Add
tests for checki
n
g
c
orrect handling of $GIT_
N
OTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API:
g
et_commit_notes() -
>
format_note() + r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
Min
o
r
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
builtin-con
f
ig: Fi
x
crash when using
"
-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han H
e
r
l
and
Add m
o
re testcases to te
s
t fast-impor
t
of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herland
Rename t9301 to
t
9350,
t
o make room fo
r
more fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-impo
r
t: Proper n
o
tes
t
ree
m
anipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herl
a
nd
F
ix crasher on encounteri
n
g
SHA
1
-l
i
k
e non-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joha
n
H
e
rla
n
d
Basic build infrastruct
u
re
f
or Pyth
o
n
s
cripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herla
n
d
Add selftests
v
e
r
ifying concate
n
ation of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
n
d
Refactor notes code to concate
n
ate multiple notes annot
a
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan
He
r
land
Ad
d
selft
e
s
t
s v
e
rifying tha
t
we can parse no
t
es
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an Herl
a
n
d
Teac
h
the n
o
tes look
u
p code to parse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Her
l
and
Teach not
e
s code to free
its internal data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
Add
fl
a
gs to get_com
m
it_n
o
te
s
() to control th
e
format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Her
l
and
t33
0
2-notes-
i
ndex-exp
e
n
sive
:
Speed u
p
crea
t
e_r
e
po()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next