repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'bw/test-fix-grep-gnuism' into maint
2012-03-15
J
oha
n
H
erland
notes-merge: Don't r
e
move
.
git/NOTES_ME
R
GE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
H
erland
notes
-
merge: use opendir/
r
eaddir instead
o
f u
s
ing rea
d
_
dire
c
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herland
t
3310: illustr
a
te failu
r
e to "not
e
s merge
--commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
fast-i
m
po
r
t:
Fi
x
i
nco
r
r
ec
t
fanout level when
m
o
d
i
f
ying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
h
an
H
e
rland
t93
0
1
:
A
d
d
2nd testcase exposing bugs
i
n fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t9301: Fix testcase covering up a bu
g
in fast-
i
mpor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan He
r
land
t5400
:
Fix a couple of
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herlan
d
Mark dirstat error m
e
ssages for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve error handl
i
n
g
wh
e
n
pars
i
n
g
d
irstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dirs
t
at=line
s
mode, doing d
i
rstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Allow specifying
-
-dirst
a
t cut-off perce
n
tage as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config v
a
riable f
o
r
s
pe
c
ifyi
n
g
defa
u
lt -
-
dir
s
tat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Refactor --dirstat parsing; deprecate --
c
u
m
u
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
M
a
ke --di
r
sta
t
=
0
out
p
ut directories that c
o
ntribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herlan
d
Add several t
e
stcase
s
fo
r
--dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan H
e
r
l
and
--d
i
rstat: In case of rena
m
es, us
e
targe
t
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herla
n
d
T
e
ach --dir
s
tat not
t
o co
m
plete
l
y ig
n
ore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
--dir
s
t
at-by
-
fi
l
e: Mak
e
it faster and m
o
re corre
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
He
r
lan
d
--di
r
stat
:
D
es
c
ribe non
-
obvio
u
s
diffe
r
enc
e
s r
e
lative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
erland
Make
"
gi
t
n
otes add" mor
e
user-fr
i
end
l
y wh
e
n there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty-options:
D
o
c
u
m
ent --[
n
o-]no
t
es and dep
r
eca
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan He
r
l
a
n
d
b
r
a
nch/checkout --trac
k
: En
s
ure that upst
r
e
am branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
de
f
au
l
t
: Rename 'tracking' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Prov
i
de 'gi
t
m
erge --abort'
a
s a
synonym to 'git r
e
se
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_mer
g
e(): Parse options before checking ME
R
GE_HEA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git notes get-ref'
to
e
asily retri
e
v
e cu
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
me
r
g
e
:
Add test
c
ase
s
for
merging
not
e
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
gi
t
n
o
t
es m
e
rge: Add another auto-resolving strateg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git no
t
es merg
e
: --co
m
mit should fail
if
und
e
rlyi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List
conflict
i
ng
n
otes in not
e
s merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merg
e
: Manual conflict resolution
,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erl
a
nd
git notes merge: Manual conflict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an H
e
rl
a
nd
Docume
n
tation: Prelimin
a
ry docs on 'git n
o
tes me
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes m
e
r
g
e: A
d
d automatic c
o
nf
l
ict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes merge: Handle real
,
non-conflicti
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
l
and
b
uilti
n
/note
s
.
c: Refa
c
tor creat
i
on of notes comm
i
t
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes
m
erge:
I
nitial i
m
p
l
e
m
entation handlin
g
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
bu
i
ltin/not
e
s
.
c: Split notes re
f
DWIMmery
i
nto a
se
p
a
r
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herla
n
d
notes
.
c:
U
s
e two n
e
wlines (instea
d
of one)
when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
(trivial) t
3
303: Indent w
i
th tabs in
s
tead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
notes
.
h/
c
: Propagate combin
e
_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
h/c: Allow combine_notes
fun
c
ti
o
ns to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herla
n
d
n
otes
.
c: Reord
e
r functions in
p
reparation for ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan H
e
rland
not
e
s
.
h: Make d
e
f
a
ult_notes_ref
(
) avail
a
ble
i
n
n
otes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
er
l
an
d
(trivial
)
notes
.
h: Min
o
r documentation fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
er
l
and
notes
.
c
:
H
exify SHA
1
in d
i
e() messa
g
e fro
m
init_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
o
han He
r
land
notes: Don't
c
reate
(e
m
p
t
y
)
c
ommit
w
hen removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
e
rl
a
n
d
En
a
ble custom schemes for column
c
o
lors in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
nd
Make graph_n
e
xt_l
i
n
e
(
)
a
vail
a
ble in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
revision: Turn off histo
r
y simplifi
c
ation in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision
:
Fix typo in --
a
nc
e
stry-p
a
th
error me
s
sage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Her
l
and
Documentati
o
n
/
rev-list-opt
i
ons
.
txt
:
Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Documen
t
a
t
ion
/
r
e
v-li
s
t-option
s
.
txt: Fix miss
i
n
g line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n
Herl
a
n
d
d
i
ff
.
c:
Ens
u
r
e "index
$
from
.
.
$to" line
con
t
ains
u
n
a
mbiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-
n
ot
e
s
:
M
inor
(
mostly parse_optio
n
s-re
l
ated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joha
n
Herl
a
nd
submodule summary: Don't barf when invoke
d
in an e
m
pt
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-no
t
es: Add "copy"
sub
c
ommand for copyi
n
g no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bu
i
ltin-
n
otes: Misc
.
r
e
f
actoring of argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
u
iltin-n
o
tes: Add -c/-C o
p
t
ions for reu
s
ing note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin
-
not
e
s: Refactor ha
n
dl
i
ng o
f
-F option to
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
H
erland
builtin-notes: D
e
p
recate
the -m/-F opt
i
ons for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes: Add "append" subcommand for a
p
pending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Add "add" subcom
m
and for adding
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-
n
otes: Ad
d
--mess
a
ge/-
-
file a
l
iases
f
or
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-notes
:
Add "list" subcommand
for listing n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herla
n
d
D
o
cumentation: Generalize git-notes doc
s
to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add
"
p
run
e
"
subc
o
mmand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API
:
prune_notes()
:
Prune
n
otes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify that removing notes
t
riggers aut
o
matic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-
n
otes: Add
"remove"
s
ubcomm
a
nd
f
or removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
e
rla
n
d
Teach
builtin
-
notes to remov
e
empt
y
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Teach
not
e
s
code to prop
e
rly preserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
t3305: Ve
r
ify
that
adding many notes
w
ith g
i
t-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify successful
a
n
notation of n
o
n
-
commit
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Builtin-ify
g
i
t
-
n
o
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Refactor notes concatenation int
o
a fle
x
ible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Not
e
s API: Allow multip
l
e
c
oncurr
e
nt
n
otes
trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
API:
wri
t
e_
n
ote
s
_tree
(
):
S
tore the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Note
s
API: for_each_no
t
e(): Tr
a
verse
t
he entire n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes API
:
get_n
o
te()
:
Ret
u
r
n the note annotati
n
g the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Notes API:
r
emove_n
o
t
e(): Remove not
e
ob
j
ec
t
s f
r
om
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
N
o
tes API: add_n
o
t
e
(): Add note objects to
the
i
nternal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes A
P
I: init
_
notes(): Initialize the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Ad
d
t
e
s
ts f
o
r checking
cor
r
e
c
t
handling of $
G
IT_NOT
E
S_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
N
otes API: get_commit_note
s
() -> fo
r
mat
_
note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rland
Mino
r
cos
m
etic fixes to
n
o
tes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
buil
t
in-con
f
i
g
: Fix c
r
ash when using "-f
<relati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add
m
o
r
e te
s
tcases
t
o test fas
t
-import of not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
R
ename t9301 to t935
0
, to make ro
o
m
f
or
more fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herl
a
nd
f
a
st-import: Pro
p
er notes t
r
e
e
ma
n
ipulati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan He
r
l
a
nd
Fix crash
e
r on encou
n
t
e
ring SHA1-like
n
on-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan H
e
rland
B
a
sic bu
i
ld in
f
rastructure for
Pyt
h
on
scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
A
d
d
selftests verifying concatenation of m
u
lti
p
le not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
R
e
fa
c
t
or notes
c
o
d
e
t
o concatenate mult
i
ple not
e
s an
n
otating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Ad
d
selftes
t
s ver
i
fying that
w
e can par
s
e
notes tre
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Teac
h
t
h
e
not
e
s
l
ookup
cod
e
to par
s
e notes t
r
ees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach notes
c
ode to
free its internal data struc
t
ures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
Add flags
to get_commit_notes() to control
th
e
format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rl
a
n
d
t330
2
-n
o
tes
-
ind
e
x-expensive: Spee
d
u
p
create_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han He
r
land
fa
s
t-imp
o
rt: A
d
d
s
u
pport
f
or import
i
ng commit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next