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
t9114.2: Don't use --track option against "svn-remote"-tracking branches
2013-04-21
Johan Herland
t
9114
.
2
:
Don't use --trac
k
opt
i
on ag
a
inst
"
svn-re
m
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t7201
.
24: Add refspec to
k
e
e
p --t
r
a
ck
wo
r
king
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
t3200
.
39:
tracking setup should f
a
il if there is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
checkout: U
s
e
r
emote re
f
specs when DWIMmi
n
g
tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024
:
Show failure to
u
se refs
p
ec when DWIMming remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t2024: Add tests verifying
c
u
rrent DWIM behav
i
or of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
g
it symbo
l
ic-
r
ef --delet
e
$s
y
mref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
Fix failure t
o
del
e
te a pa
c
ked ref
t
hrough
a
s
ymre
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herla
n
d
t1400
-
updat
e
-ref:
A
dd test v
e
rifying bug with s
y
mrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herl
a
nd
notes-merge
:
Don't remo
v
e
.
git/NOTES_MERGE_WORKTRE
E
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
not
e
s-merge: use op
e
ndir/readdir inste
a
d 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
t
3
31
0
:
i
llustrat
e
f
a
ilure to "
n
otes me
r
ge --
c
ommit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
fast-import: Fix inc
o
rrect fanout level
w
h
e
n modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
la
n
d
t9301
:
Add 2nd
testcas
e
exp
o
sing
bugs in f
a
st-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
oh
a
n Herland
t9301: Fix testcase co
v
ering up a b
u
g
in fas
t
-impor
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
J
o
han Her
l
and
t
5400: Fi
x
a
c
o
u
ple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Her
l
and
Mark dir
s
tat
error messag
e
s f
o
r tr
a
nslation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Her
l
a
n
d
Im
p
rove error
h
andlin
g
when
p
a
r
sing dirstat parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New
--dirstat
=
li
n
es mode, doing dirst
a
t
an
a
lysis b
a
sed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rla
n
d
Allow specifying
-
-
dirstat cut-off percenta
g
e as
a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
A
d
d
c
onfig variable for specify
i
ng default
-
-
d
irstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor --dirstat
parsi
n
g; deprecate --
c
u
mu
l
ative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Make
--dirst
a
t=0
output dire
c
t
ories that cont
r
ibute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Add sev
e
ral
t
estcases for --dirstat and friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
J
ohan Herland
--dirstat: In case o
f
renames,
use ta
r
get filena
m
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
Teach -
-
dirsta
t
not
to c
o
mpletely ign
o
re
r
earra
n
ged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rl
a
nd
--d
i
rstat-by-f
i
le: Make it
faster
a
n
d more correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Descr
i
be non-obvious differences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "gi
t
notes add" more user-friendly w
h
e
n
there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
l
o
g/pretty-options:
D
o
cum
e
nt --[no-]
n
otes
and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
b
r
anch/c
h
e
c
kout --track: Ensure that
u
pstream br
a
nch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default: Rename '
t
racking'
to 'upstr
e
am'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git
merge -
-
abort' a
s
a synon
y
m
to
'
g
it reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_
m
erge(): Parse options befo
r
e checking MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Provide 'gi
t
notes get-ref' to easil
y
ret
r
iev
e
current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git note
s
me
r
ge: Ad
d
testcases for
m
e
r
gin
g
notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
nd
git notes merge: Add anothe
r
auto-reso
l
ving
s
trategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
g
i
t not
e
s merge:
--commit should fail
if u
n
der
l
y
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
g
i
t notes
merg
e
:
L
ist conflicting notes in notes
m
erge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
gi
t
notes merge: Manual c
o
nflict resolution, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merg
e
:
M
anual c
o
nflict resolution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documenta
t
i
o
n: Preliminary docs on 'gi
t
notes me
r
g
e
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herla
n
d
git notes merge:
A
dd a
u
tomati
c
con
f
lict res
o
l
vers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merge: Handle rea
l
, non-conflict
i
ng note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
b
u
il
t
in
/
notes
.
c:
R
efa
c
t
o
r c
r
e
a
tion o
f
n
ote
s
commit
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes mer
g
e: Initi
a
l implementatio
n
handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
builtin/notes
.
c: Split notes
r
ef DWI
M
me
r
y in
t
o a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
Herland
notes
.
c
:
Use t
w
o
newlines
(
instead of one) wh
e
n
c
o
nca
t
enatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
(trivial) t3303: In
d
ent wit
h
tabs instead
o
f spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
note
s
.
h/c: Propagate combine_n
o
tes_fn return val
u
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
n
o
t
es
.
h/c: A
l
low combine_notes functions to
rem
o
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an He
r
land
notes
.
c
: Reorder functions in
preparation for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
h: Make defau
l
t
_
n
ote
s
_ref() available in no
t
es
A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
(tri
v
ial)
n
ote
s
.
h: Min
o
r documentation
fix
e
s to
copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an H
e
rland
note
s
.
c: Hex
i
fy
S
HA1 i
n
die() message fr
o
m init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herlan
d
notes
:
Don't
create (empty) c
o
mmit when
remov
i
ng no
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rland
E
nab
l
e custom sc
h
emes fo
r
co
l
um
n
colo
r
s in
the gr
a
p
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herlan
d
Make graph_next_line(
)
avai
l
a
b
le in the grap
h
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n
H
erland
r
evis
i
o
n
:
T
urn off hi
s
tory simplificatio
n
in --anc
e
stry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
revision
:
Fix
t
ypo
i
n --ancest
r
y-p
a
th
error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n H
e
rland
Documentation/rev-list
-
options
.
txt: Exp
l
ain --ance
s
try
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
D
o
c
umentation/rev-list-options
.
txt
:
Fix missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Her
l
a
n
d
diff
.
c: Ensure "in
d
ex $f
r
om
.
.
$to
"
l
ine con
t
a
i
ns unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan He
r
land
built
i
n-notes
:
M
inor (mostly parse_op
t
ions
-
relat
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule summa
r
y
: Don't
barf when invoked in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
il
t
in-note
s
: Add
"
copy"
s
u
bcomma
n
d for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Misc
.
r
e
fact
o
ring
o
f argc an
d
e
x
it
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin
-
notes: Ad
d
-c/-C op
t
io
n
s for reusin
g
n
ote
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
builtin-notes: Refac
t
o
r handling of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
buil
t
in-notes: Depre
c
a
t
e the -m/-F options f
o
r "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
builtin-notes: Add "
a
ppend" sub
c
omman
d
for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes: Ad
d
"
a
dd
"
su
b
comma
n
d for add
i
n
g
note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builti
n
-
n
o
tes: A
d
d
--messag
e
/--fi
l
e aliases
for
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes: Add "list"
subcommand
for listi
n
g
note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
D
o
c
ume
n
tation: Gen
e
ralize git-note
s
docs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd "
p
rune" su
b
command for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: pr
u
n
e_notes(): Prune n
o
t
e
s that b
e
long
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
t3305: Ve
r
ify
tha
t
removi
n
g notes
t
ri
g
gers
a
utomatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
builtin-notes: Add "remove" s
u
bcommand for remo
v
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Tea
c
h b
u
iltin-notes to
r
e
m
ove empty
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Teach notes
c
ode to properly pre
s
erve non
-
notes i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
la
n
d
t3305
:
Verif
y
that adding
m
any not
e
s
with
g
it-
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3301
:
V
e
rify success
f
ul an
n
otation of no
n
-commits
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
Joha
n
He
r
land
Refactor notes concatenat
i
on into a flexible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: Allow multiple c
o
n
current not
e
s
t
rees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
otes API:
w
rite_note
s
_tre
e
():
S
t
ore the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes AP
I
: fo
r
_each_note(): Traverse the enti
r
e notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: get_note(): Return the note annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: remove_note(
)
:
Remov
e
note objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
No
t
es API: ad
d
_
note(): Add n
o
te objects to the internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: init_notes(): Initiali
z
e the
notes tre
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Add tests
for ch
e
cking correct handling of $
G
IT_
N
OT
E
S_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
g
et_co
m
mit_not
e
s()
-> format_no
t
e() +
rem
o
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Minor cos
m
etic
fixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herl
a
nd
b
u
iltin-config: Fix
c
rash when using "-
f
<relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
A
d
d more testca
s
e
s
to test fast-
i
mport of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to t9350, to make room
for more f
a
s
t-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
Her
l
an
d
fast-import: Proper notes
tree manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan
H
e
r
l
a
nd
Fix crasher on
en
c
ounte
r
i
n
g
S
HA
1
-
l
ike no
n
-note in no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next