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
checkout: Use remote refspecs when DWIMming tracking branches
2013-04-21
Joh
a
n
Herland
c
h
eckout: Use remo
t
e r
e
fspecs
w
he
n
DWIMming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
t2024:
Show
failure to
u
se
r
efspec wh
e
n DWIMmi
n
g remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t
2
02
4
: A
d
d tests veri
f
y
ing
c
urre
n
t DWIM
b
eh
a
vior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
a
n
Herland
git symbolic
-
r
e
f --d
e
l
e
t
e
$
s
ymre
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
l
and
Fix failu
r
e
t
o delete a packed
r
e
f th
r
ough a
s
ymre
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
n
d
t1400
-
update-ref: Add test v
e
rify
i
ng bug with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
no
t
es-merge: Don't remo
v
e
.
git/NOTES_MERGE_W
O
RKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
no
t
es
-
merge: use op
e
ndir/readdir instead
o
f using re
a
d_d
i
r
e
c
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Herl
a
n
d
t3310: illu
s
trate failure
to
"no
t
es merge --
c
omm
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
fast-
i
mpor
t
: Fi
x
inc
o
r
r
ect
fanout level when modifyin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
t
9
301: Add 2nd t
e
s
tcase expos
i
ng bugs in fast-impo
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
a
n
Herl
a
nd
t93
0
1: Fix testc
a
se
c
ove
r
ing up a
b
u
g in fast-im
p
ort
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herl
a
nd
t5400:
F
ix a co
u
pl
e
o
f typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
oha
n
Herland
Mark dirstat error messages for tr
a
nslatio
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Improv
e
error handl
i
ng
w
h
e
n
p
a
rsing
d
irstat para
m
eters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
New --di
r
s
tat=l
i
nes mo
d
e
, doing dirstat
a
n
a
lysis bas
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
r
l
and
Allo
w
sp
e
cifying --dirstat c
u
t-
o
ff perce
n
tage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add confi
g
v
ariable for
specify
i
ng default --
d
i
rstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
R
efa
c
tor --dirstat
p
arsing; dep
r
ecate --
c
u
m
ula
t
i
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make --dirstat=0 output directories that
c
o
ntrib
u
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add se
v
e
r
al tes
t
cases for --dirsta
t
and friend
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirs
t
at: In
c
ase of renames, use
t
a
rget
filen
a
me
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
a
n
H
erl
a
n
d
Teach --di
r
stat not to completel
y
ig
n
ore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-file: Make it faster a
n
d mo
r
e correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: D
e
scribe
n
on-obvious di
f
ferences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
Herland
Make "git notes a
d
d
"
more
user-f
r
iend
l
y when t
h
ere
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herla
n
d
log/pret
t
y-options: Document --[no
-
]notes and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan
Her
l
and
br
a
n
ch/checkout --trac
k
: Ensure that upstrea
m
branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herl
a
nd
pus
h
.
d
efault:
R
ename 'trackin
g
' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Pr
o
vide
'git m
e
rge --
a
bort' as a syn
o
nym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
a
n
d
c
m
d
_
merge(): Pa
r
se option
s
before c
h
eckin
g
MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erland
Provide 'git notes
ge
t
-ref' to easily retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
note
s
merge: Add te
s
tcases for
m
erging notes t
r
ees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add another aut
o
-resol
v
ing
s
tr
a
tegy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git n
o
tes merge: --co
m
mit shoul
d
fail i
f
underlyi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Li
s
t conflicting
notes in notes mer
g
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
i
t n
o
tes merge:
M
anual conflict
r
esolution, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes
merge:
Ma
n
u
a
l
conflict resoluti
o
n,
part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
D
o
cumentation: Preliminary d
o
cs on 'git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herl
a
nd
git notes merge
:
Add automatic conflict re
s
olvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes merge: Handle real,
non-confli
c
t
i
ng no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
nd
builtin/notes
.
c: Ref
a
cto
r
crea
t
ion of notes
c
ommit
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: Initi
a
l impl
e
me
n
tation handling tri
v
i
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
builti
n
/notes
.
c: Split notes ref DWIMmery into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
n
otes
.
c: U
s
e tw
o
newlines (
i
nstead of one) when conca
t
enatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
(
t
r
i
vial) t
3
303:
I
ndent wit
h
ta
b
s i
n
s
t
ead of
spac
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Her
l
a
n
d
notes
.
h/c: Propagat
e
combine_notes_fn
r
e
turn v
a
lu
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herlan
d
n
otes
.
h/c
:
Allow
combin
e
_note
s
funct
i
ons to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: R
e
order
fu
n
c
t
ions in preparation
for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n Her
l
and
n
otes
.
h: Make
default_not
e
s_ref() av
a
i
l
a
b
le in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
(
t
riv
i
al) not
e
s
.
h: Minor documentation fixes
t
o co
p
y
_
n
otes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c: Hexify
S
HA1 in die()
m
essage
from init_n
o
t
es()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n Herland
notes: D
o
n't create (e
m
pty) commit whe
n
r
e
m
o
ving non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herland
Enable cu
s
t
o
m schemes for colu
m
n col
o
rs in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
He
r
land
Make graph_
n
ext_line() available
in the graph
.
h A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
revision
:
Turn o
f
f history sim
p
lification i
n
-
-
ancest
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
r
e
visio
n
: Fi
x
typo in --a
n
cestry-
p
ath error messag
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docu
m
enta
t
ion/
r
ev-list-options
.
tx
t
: Ex
p
lain --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rla
n
d
Docu
m
e
ntatio
n
/rev-list-op
t
ions
.
t
xt: Fix missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Joha
n
Herland
diff
.
c: Ensure "index $from
.
.
$
t
o" line conta
i
ns
unambig
u
ous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an Herla
n
d
builtin-notes:
Min
o
r (mostly
parse_op
t
ions-r
e
lated
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n Herland
s
ubmodule
sum
m
ar
y
: Don't barf when invoked in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
builtin-notes:
Add "
c
o
p
y
" su
b
c
o
mmand for copying n
o
t
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
builti
n
-notes: Misc
.
refactoring of argc and
e
xit
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Add -c/-C optio
n
s
f
or
r
eusing
n
otes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builti
n
-notes: Ref
a
ctor handling of -F option
t
o
a
l
low
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
bui
l
t
in-not
e
s: Deprecate the -m/-F options for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
l
a
nd
builtin-notes: Add "ap
p
end" su
b
c
o
mmand
for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "a
d
d" s
u
bco
m
m
a
n
d
f
o
r adding no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: Add
-
-me
s
s
a
ge/--file aliases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-note
s
: A
d
d "list" subcomman
d
for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
D
o
cument
a
tion: G
e
nera
l
i
z
e
git-notes docs to
'
o
b
j
ec
t
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Add "
p
rune" s
u
b
c
omm
a
nd for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: p
r
u
ne_notes(): Prune n
o
tes th
a
t belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3305: Verify that removin
g
note
s
trigger
s
automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
te
s
: Add "remove" subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Teach
builtin
-
n
o
t
e
s t
o
remove
empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Tea
c
h not
e
s cod
e
to pr
o
p
e
rly
p
reserve non-n
o
te
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3305: Verify
t
ha
t
adding many
n
ote
s
with gi
t
-no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
e
rland
t33
0
1: V
e
rify successful annotation of non
-
co
m
m
its
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
Johan Herla
n
d
Refactor
n
o
tes conca
t
enation into a fl
e
xi
b
le i
n
terface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
Note
s
API
:
Allow m
u
l
t
iple concur
r
e
nt no
t
es
trees wit
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
N
o
tes
A
PI: write_notes_tree(): Store the
n
o
tes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI: for_each_note(): Traverse the
en
t
ire n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
Notes
API: get_not
e
(): Return the note
a
nnotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Not
e
s
A
P
I
:
remove_note():
Remove note objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I: add_
n
o
t
e
(): Add note objects to t
h
e internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Not
e
s API: init_notes():
I
nitialize
the notes tr
e
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Add tes
t
s for ch
e
cking correct handling
o
f $GIT_NOTE
S
_
REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
Notes
API: get
_
commit_n
o
tes() -> forma
t
_
n
ote() + re
m
ove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
lan
d
Minor cosm
e
tic fixes
to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
b
u
ilt
i
n-con
f
ig: F
i
x crash when using "-f <re
l
a
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herland
Add m
o
re testcases to test
fast-i
m
por
t
of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herland
R
e
name t9301 to t935
0
, to
make room f
o
r
mo
r
e fast-imp
o
rt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herl
a
nd
fas
t
-
import: P
r
oper
n
otes
t
ree m
a
nipu
l
a
t
ion
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herl
a
nd
Fix crasher o
n
encoun
t
ering SHA
1
-lik
e
non-note in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Her
l
a
n
d
Basic bui
l
d infrastruct
u
re fo
r
P
y
tho
n
scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Add selftests ve
r
ifying co
n
catenation of multiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
e
rland
Refacto
r
not
e
s code to co
n
c
atenate multiple notes a
n
n
otat
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next