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
name-rev: differentiate between tags and commits they point at
2013-06-12
Johan Herland
Mo
v
e create_notes_com
m
it() from note
s
-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Mo
v
e
copy_note_
f
or_rewr
i
te + friends from bui
l
ti
n
/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
Herland
finish_copy_notes_for_rewrite(): Let calle
r
pr
o
vid
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
Herland
glos
s
ar
y
: Update
a
nd rep
h
rase t
h
e definition of
a remo
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
bran
c
h
.
c: Validate
t
racking bran
c
hes with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2: Don't use --track
o
ption
against "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
Herl
a
nd
t7201
.
2
4: Add refspec
t
o keep --track wo
r
k
ing
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t3200
.
39:
tracking setup should fail i
f
t
here is
no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checko
u
t
: Use re
m
o
t
e refspecs
when DWIMmi
n
g tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herla
n
d
t2024: Show failure to use r
e
fspec when DWIMmin
g
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an He
r
land
t2024: Add
tests
verifyin
g
current DWIM behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symbo
l
ic-
r
ef --delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
H
e
r
land
Fix
f
ailure to delete a packed r
e
f through a symr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
e
r
land
t1400-up
d
a
t
e-ref: Add test verifying b
u
g
with symr
e
fs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herla
n
d
notes
-
merge: Don't remove
.
git/NOTES_MERGE_
W
ORKT
R
EE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: us
e
o
p
en
d
i
r
/re
a
ddir inst
e
ad of us
i
n
g read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
oh
a
n Herland
t3310: illu
s
trat
e
failure to "notes me
r
ge
-
-
commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast-i
m
po
r
t: Fix incor
r
ect
fanout level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
t9301:
Add 2nd
testcase exposing
b
ugs in fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
H
e
rland
t9301: Fix t
e
stcas
e
covering up
a
b
ug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
erland
t5
4
0
0
:
F
ix a coup
l
e of
t
y
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
M
a
r
k
dirstat
error messag
e
s for transl
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
I
mprove error handlin
g
wh
e
n parsing dirstat p
a
rame
t
ers
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New
--dirstat=lines mode, do
i
ng di
r
s
t
at
a
nalysi
s
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
llow specif
y
i
n
g --dirstat cut
-
off percenta
g
e as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herl
a
nd
Add conf
i
g variable fo
r
s
p
eci
f
y
ing default --dir
s
t
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Ref
a
ctor
-
-dirstat pars
i
ng;
d
ep
r
e
c
ate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Make
-
-dirs
t
at=0 output directories
th
a
t co
n
trib
u
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Add severa
l
t
e
stcases
for --di
r
stat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
land
-
-
d
i
r
stat: In cas
e
of rename
s
, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
Teach --
d
irstat n
o
t to compl
e
t
ely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rland
--dirstat-
b
y-fi
l
e: Make it
faster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Des
c
ribe non-obvious diffe
r
ences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git n
o
tes add"
m
ore user-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an Herland
log/
p
retty-
o
ptions:
Do
c
ument --[no-]notes a
n
d depr
e
cate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
Herland
br
a
nch/checkout --tr
a
c
k
:
Ensure that
u
pstream bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n Herland
p
ush
.
d
efault: Rename 'tracki
n
g
'
t
o
'upst
r
eam'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
r
l
an
d
Prov
i
de 'gi
t
merge --abort' as
a
synonym to 'git
r
es
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
cmd_
m
erge
(
): Parse options
before checking ME
R
GE_HE
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
rovid
e
'git notes get-ref' to easily retr
i
eve cur
r
e
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge: Add
t
es
t
cases for m
e
rging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes m
e
r
ge: Add another auto-res
o
lving
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
git notes merge:
--commit sh
o
uld fail if
u
nderlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
g
it
n
ote
s
merge: List conflic
t
ing notes in
n
ote
s
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git note
s
me
r
ge:
M
anu
a
l conflict resolution,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes
merge: M
a
nual co
n
flict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
D
ocumentation:
P
reliminar
y
d
o
c
s on
'
g
it n
o
t
e
s
m
erge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t notes merge: A
d
d
automatic
conflict resolve
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
git
n
ot
e
s merge: Handle re
a
l, non-conflicting
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bu
i
ltin/notes
.
c:
Refactor cre
a
tion
o
f notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Initial implementation handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
b
uiltin/notes
.
c: Split notes ref DWIMmery int
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 newlines (in
s
t
e
ad of one)
when conc
a
tenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
(trivial) t3303
:
Inden
t
w
i
th tabs instead of sp
a
ces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
notes
.
h
/c: Propagate
combine_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Her
l
a
nd
n
otes
.
h
/c:
Allow
combine
_
n
otes f
u
nctions to re
m
ove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
c
:
Reorder function
s
i
n
p
reparation for nex
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herla
n
d
notes
.
h
: Mak
e
def
a
ult_no
t
es_re
f
()
available
i
n
n
ot
e
s API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
(trivial) notes
.
h: Minor doc
u
me
n
tatio
n
fix
e
s to
c
opy_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
c
: Hexify
S
HA1 in
die() mes
s
age
f
rom
i
nit_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herlan
d
no
t
es: Don't create (
e
mpty
)
com
m
it
w
h
e
n
re
m
oving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
h
an Herl
a
nd
E
n
able cust
o
m sc
h
emes for column colors
i
n
the graph AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
Make g
r
aph_ne
x
t_line(
)
availabl
e
i
n
the g
r
aph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rlan
d
r
e
vi
s
ion: Tur
n
off
h
i
story s
i
m
pl
i
fication in
-
-
anc
e
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
revision
:
Fix typo in --an
c
est
r
y-path
e
rror message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
an Herland
Doc
u
menta
t
ion/r
e
v
-list-opti
o
ns
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n H
e
rland
Documentation/rev-lis
t
-
o
ption
s
.
tx
t
: Fix m
i
ssing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
an Herlan
d
di
f
f
.
c:
Ensure "i
n
dex $from
.
.
$
t
o" line con
t
ains unam
b
igu
o
us
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Joh
a
n He
r
land
b
u
iltin-notes: Minor (mostly
p
arse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submo
d
ule summary: Don't b
a
rf when i
n
voked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
builtin-notes
:
A
d
d "co
p
y" sub
c
ommand for
copying
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-n
o
tes: Misc
.
refactoring
of argc
a
nd e
x
it
valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
b
u
i
l
tin-no
t
es: Add -c/-C options for reusing
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
bu
i
l
t
in-no
t
es: Refactor handling of -F option
to al
l
ow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Depre
c
ate
t
he
-
m/-
F
options for "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
b
ui
l
tin-note
s
: Add "a
p
pe
n
d" subcommand fo
r
appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
buil
t
in
-
note
s
:
A
dd
"
add" subcommand for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-
n
o
t
es: Add --message/--file aliases
f
or -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
builtin-notes: Add "list" subco
m
mand for
l
i
s
ting
n
ot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Doc
u
ment
a
tion: Genera
l
iz
e
git-
n
o
t
es
d
ocs to 'obje
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Add "prune" subcommand for re
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
N
otes
A
PI: prune_notes(): Prune notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
t3
3
0
5: Verify th
a
t removin
g
n
o
t
es triggers a
u
tomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
b
u
iltin
-
note
s
: Add "
r
emo
v
e
" subcommand
f
or removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Tea
c
h
bu
i
l
tin-note
s
t
o
r
e
m
o
ve emp
t
y notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
T
each note
s
co
d
e t
o
properly preser
v
e non-notes
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
t330
5
: V
e
r
ify that addi
n
g many no
t
es
w
i
t
h git
-
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
t3301:
Verify success
f
ul annotation of
n
o
n-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Builtin-ify git-no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Refactor notes concaten
a
tion into a
f
le
x
ible inte
r
face
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: Allow multiple concurrent
notes tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
Herland
Notes API: write_
n
otes_tree(): Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API: fo
r
_each
_
no
t
e(): Tr
a
verse the
entire
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_note(): Return the no
t
e annotating
th
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
Notes
A
PI: remove
_
note():
R
emove no
t
e objects f
r
om
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Her
l
and
Notes API: add_note(): Add n
o
te o
b
j
e
c
ts to
t
h
e internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API: in
i
t_n
o
tes
(
): Initializ
e
t
h
e notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Ad
d
t
e
sts
f
or
c
hecking correct handling of $GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes API: get_comm
i
t_notes() -> form
a
t_note
(
) + remov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Minor
cosmeti
c
f
i
x
e
s to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next