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
J
o
han Herland
checkou
t
: Us
e
r
emote r
e
fspecs whe
n
DWI
M
ming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
H
erl
a
nd
t2
0
24: S
h
ow
f
a
i
lure to
use r
e
fspe
c
w
h
en DWIMming re
m
o
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Add tests verifying cu
r
rent DWIM behav
i
or of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
git symbolic-ref --
d
elete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herl
a
nd
Fix failure to del
e
te a packed ref
t
hrough a
s
ymref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herland
t1400-update-ref: A
d
d test verifyin
g
bug with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
l
a
nd
notes-mer
g
e: Don't remove
.
git/NOTES_MERGE_WORK
T
REE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
land
n
otes
-
merge:
use opendi
r
/r
e
addir i
n
stead of using rea
d
_
d
irec
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herla
n
d
t
3310: illustrate failure to "notes merge --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
f
ast-import: Fix
i
ncor
r
ect fanout level when modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
t9301: Add 2
n
d
t
est
c
ase
exp
o
sing b
u
g
s in
f
ast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301
:
Fi
x
tes
t
case covering up a bug
in fast
-
i
m
p
or
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a cou
p
le of
t
ypos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ma
r
k
d
irstat error me
s
sages
f
o
r translat
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve error handling when
p
arsin
g
dirs
t
at p
a
rameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
New --di
r
stat=lines mode, do
i
n
g
dirs
t
at analysis
based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Allow
s
pecifying --dirstat cut-off per
c
entage as
a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Add config variable for
specifying default --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n Herlan
d
Refactor --dirstat parsing; deprecate --cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Make --dirstat=0 output directo
r
ies th
a
t contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Ad
d
seve
r
al
t
e
stcases
f
o
r
-
-
d
irs
t
at and frie
n
ds
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Herland
--dirstat: In cas
e
of
renames,
u
se tar
g
et filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dirstat
n
ot to c
o
mplet
e
ly ignore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
e
rla
n
d
--dirstat-by-file: Make it fas
t
er and more corre
c
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: De
s
cribe non-obv
i
ous difference
s
relat
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han
Herland
Make "g
i
t n
o
tes add" more user-friendly
when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herland
l
og/
p
re
t
ty-opti
o
ns: Document
-
-[no-]no
t
es and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
oh
a
n
Herla
n
d
branch/checko
u
t --
t
rack: Ensure that up
s
tre
a
m branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han
He
r
land
push
.
def
a
ult: Rename 'tracki
n
g' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Provide
'
g
i
t mer
g
e --abort
'
as a
syno
n
y
m
t
o
'
git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
c
m
d_
m
erge(): Pa
r
se options be
f
o
r
e checking
M
ER
G
E
_
HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'g
i
t notes ge
t
-ref' to easily ret
r
i
e
v
e
current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
A
d
d
testcases for merging not
e
s
trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
l
a
n
d
git
n
otes me
r
ge: Add an
o
ther
a
uto-resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
nd
git n
o
tes merg
e
: --commit s
h
ould fail if u
n
derlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
git
n
otes m
e
rge: List conflicting note
s
in
notes mer
g
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
mer
g
e: Ma
n
u
al
c
onflict res
o
lu
t
ion, par
t
2
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
git notes merge
:
Manual conf
l
ict resolut
i
o
n, part
1
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Docu
m
entation: Prelim
i
nary
d
ocs on 'git
n
otes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
n
o
tes merge: Add automatic conflic
t
reso
l
vers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes me
r
ge: Handle real,
n
on-conflicti
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
builtin/note
s
.
c:
Refactor cre
a
t
ion of
n
otes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t n
o
tes merge: Init
i
al implementatio
n
handling
t
rivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/n
o
t
es
.
c: Split notes
r
ef DWIMmery into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
notes
.
c: U
s
e two newlines (instead
of on
e
) whe
n
concat
e
n
a
tin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
(trivi
a
l)
t3303: Inden
t
with tabs instead of s
p
aces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Pr
o
pagate
combine_not
e
s_fn return
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an
Herland
notes
.
h
/c: A
l
l
o
w c
o
mbine
_
not
e
s functio
n
s to remo
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c
: Reorder functi
o
ns i
n
prepa
r
ation for nex
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
h: Mak
e
defaul
t
_notes_re
f
() available in no
t
es API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
(trivia
l
) notes
.
h: Minor do
c
umentation fixes
t
o c
o
py_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Her
l
and
notes
.
c:
H
exify SHA1 in die() me
s
s
a
g
e
from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Her
l
and
notes: Don't create
(
emp
t
y
)
comm
i
t
when
re
m
oving n
o
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enab
l
e custom schemes for colu
m
n
c
ol
o
rs
i
n
the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n Herl
a
nd
M
a
k
e
graph_next_
l
i
n
e
() availa
b
le in the grap
h
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rla
n
d
revisi
o
n: Turn off his
t
ory si
m
plif
i
cat
i
on in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
on:
Fix
typ
o
in --ancestry-path e
r
ror
m
essage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Her
l
a
n
d
Documentation/rev-list-o
p
tions
.
txt: Exp
l
ain --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
oha
n
He
r
l
a
nd
Docum
e
ntation/
r
e
v-list-
o
ptions
.
txt: F
i
x mi
s
sing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensu
r
e "index $from
.
.
$to" l
i
ne
con
t
ai
n
s
u
n
a
mbiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herl
a
nd
builtin
-
note
s
: M
i
nor
(
most
l
y parse
_
options-r
e
la
t
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herlan
d
subm
o
dule summary: D
o
n
'
t barf when invoke
d
in an
e
mpt
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes
:
Add "copy" subcomman
d
for copyi
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
bui
l
tin-notes: Misc
.
refactori
n
g of argc and
e
xit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Add -
c
/-
C
options fo
r
reusing
no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes: Re
f
actor handling of
-F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
nd
builti
n
-
n
otes: De
p
recate the -m/-F
o
ptions for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
built
i
n-n
o
tes: Add "appen
d
" subcomma
n
d f
o
r
ap
p
ending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
uilt
i
n-notes: Add "add" subcommand for adding n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
builti
n
-notes: Add --
m
essage
/
--fi
l
e al
i
ase
s
for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes:
Add "list
"
subcommand for
l
isting no
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Do
c
umentat
i
o
n: Gen
e
ra
l
ize git-notes
doc
s
to 'o
b
j
e
cts
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
l
a
nd
builtin-not
e
s:
A
d
d "prune" subcommand for rem
o
v
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
Notes API: pru
n
e_
n
otes():
P
r
u
n
e notes tha
t
belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
t3305: Verify t
h
at rem
o
ving notes triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
b
u
ilti
n
-
notes: A
d
d "remove" subcomm
a
nd for re
m
oving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Te
a
c
h built
i
n-notes to remove e
m
pty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
Teach notes code
to properly pre
s
erve
n
on-
n
otes
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3305
:
Verify
that a
d
d
i
n
g many notes with
git
-
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
r
l
an
d
t330
1
: Verif
y
success
f
ul annota
t
io
n
of no
n
-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
Buil
t
in-ify git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Refactor notes conca
t
ena
t
i
o
n
in
t
o a flexible
i
nte
r
face
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rla
n
d
Notes API:
A
llow multiple
c
oncu
r
r
e
nt n
o
tes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes A
P
I: write_n
o
tes_tree():
Store the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
N
o
tes
A
PI: for_each_n
o
te():
Travers
e
the enti
r
e n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
No
t
es API:
get_note(): Return the
n
ot
e
annotating
the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: r
e
move_note(): Remove note
obj
e
c
t
s from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
Notes API: add_note(): Add note objects
t
o
th
e
in
t
ernal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes
A
PI: init
_
no
t
es(): I
n
itial
i
ze the notes
t
ree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
A
dd tests for checking correct h
a
ndling of
$
G
IT
_
NOTES
_
REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes
A
PI:
get_co
m
mi
t
_n
o
t
es() -> f
o
rmat_note() +
r
emove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmetic fixes
to note
s
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builti
n
-conf
i
g: Fix
c
rash when
u
s
i
ng "-f
<
relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
Herla
n
d
Add more testcases to test fast
-
impo
r
t of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301
t
o t9350, to make
r
oom for
m
o
re fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herl
a
nd
fast-import: Prop
e
r not
e
s tree man
i
pu
l
at
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan H
e
rlan
d
Fix
c
rasher on
enco
u
ntering SHA1-like non-
n
ote in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan He
r
land
Basic build infra
s
tructure for
P
ython scr
i
pts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d s
e
lftests verif
y
in
g
c
o
n
cate
n
ation of multi
p
le
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refact
o
r notes code to concatenate multiple n
o
tes annota
t
in
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next