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
t7201.24: Add refspec to keep --track working
2013-04-21
J
ohan Herl
a
nd
t7
2
0
1
.
24: Ad
d
refspec to keep --tra
c
k
w
orking
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
t3200
.
39: t
r
a
ck
i
ng setup sho
u
ld
fail if the
r
e is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout:
U
se
remot
e
refspecs when DWI
M
ming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
He
r
la
n
d
t202
4
: Show failu
r
e to us
e
refspec when DWIMmi
n
g remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
la
n
d
t20
2
4:
A
dd t
e
sts v
e
rifying cu
r
rent DWIM behavior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
g
i
t sym
b
olic-
r
e
f
--dele
t
e $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
Fix failure to de
l
ete a packed ref t
h
rough a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herla
n
d
t1400-u
p
da
t
e-ref: Add test
v
erifying bug
w
i
th s
y
mr
e
fs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: D
o
n't r
e
move
.
git/
N
OTES_MER
G
E_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merg
e
:
use opendir/readd
i
r instead of
u
s
ing 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
t3310: i
l
lust
r
ate failu
r
e to "not
e
s merge --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast-import: Fix incor
r
e
c
t fanout level when modif
y
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han
He
r
land
t9
3
01: A
d
d 2nd
te
s
tc
a
se exposing bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
r
land
t9301: Fi
x
tes
t
ca
s
e co
v
e
ring up a
bug in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
J
ohan
Herla
n
d
t
5400: Fix a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n
Herla
n
d
Mar
k
di
r
stat error messages for
t
ra
n
slatio
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Im
p
rov
e
err
o
r handling when parsing d
i
r
s
t
at parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
New --dirst
a
t=lines m
o
de, doi
n
g dirstat ana
l
ysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
lan
d
Allow specifying
--dirsta
t
c
u
t-off percentage as
a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Add confi
g
variable
f
or specifying defa
u
l
t
--dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
H
erland
Refacto
r
-
-
d
i
rstat
parsing; deprec
a
te --cumula
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Make -
-
dirstat=0 output director
i
es that contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Add
s
e
ver
a
l tes
t
cases for
--dirstat and fri
e
nds
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
J
o
h
a
n He
r
land
--dirsta
t
: In
c
a
s
e of
r
ena
m
es,
u
se target file
n
ame
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
Teac
h
--dirstat not to
c
omplete
l
y
i
gnore rearran
g
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
--dirs
t
at-b
y
-fi
l
e:
Make
i
t f
a
s
t
er a
n
d
m
or
e
correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--dirstat: Describe non-obv
i
ous
dif
f
erences
r
e
lative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Her
l
and
Make "git notes add
"
m
o
re use
r
-
f
rie
n
dly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/prett
y
-options: D
o
cument --
[
no-]note
s
and dep
r
ecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Her
l
a
n
d
b
r
anch/checkout --track: Ensure that upstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
J
o
h
a
n Herland
push
.
def
a
u
lt:
Rename 'tracking' to 'upstr
e
a
m
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Provide 'git m
e
rge
-
-abort' as a synonym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
cmd_me
r
ge(): Par
s
e
opt
i
on
s
before checking MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
Provide
'
git n
o
t
e
s
get-ref' to easily retrieve
c
urr
e
nt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
git notes merge: Add testcase
s
for mergin
g
n
otes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
git notes m
e
rge: Add ano
t
her a
u
to-resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git note
s
me
r
ge: --commit should fai
l
if
u
nderlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
git notes merge: List
conflictin
g
notes in
n
o
tes
m
e
rge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge: Manual conf
l
ict resolution, par
t
2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rla
n
d
g
i
t no
t
es merge
:
Manual conflict resolution,
p
a
r
t 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
D
ocume
n
tatio
n
: Prel
i
minary
d
oc
s
on 'git n
o
tes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Her
l
a
n
d
git notes
m
erge:
Add
a
utomati
c
c
o
nf
l
ict resol
v
ers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
n
o
t
es merge: Han
d
le re
a
l, non-c
o
nfl
i
cting no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin/
n
otes
.
c:
Refact
o
r c
r
ea
t
i
o
n
o
f n
o
tes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
git
notes merg
e
:
Ini
t
ial imp
l
ement
a
t
i
o
n
handling trivi
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builti
n
/
n
o
tes
.
c:
S
plit notes ref
D
WIM
m
e
r
y into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
notes
.
c: Use two
n
ewlin
e
s (in
s
tead
o
f
one
)
when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
(trivial) t3303: I
n
de
n
t with
t
abs instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
an
d
notes
.
h/c: Pro
p
agate combine_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
h/c: Allow combine_notes funct
i
ons to re
m
ove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
not
e
s
.
c:
R
e
o
rder f
u
n
c
tion
s
i
n preparation for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herlan
d
notes
.
h: M
a
ke default_notes_ref(
)
available
in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(tr
i
vial) notes
.
h: Mi
n
or docume
n
tation fixe
s
t
o
copy_n
o
tes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
n
o
t
es
.
c
:
Hexi
f
y SHA1
i
n
die() message from
i
nit_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
an Herland
no
t
e
s: Don't create (empty) comm
i
t when
remov
i
ng
n
o
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable c
u
stom scheme
s
f
or
co
l
umn colo
r
s in th
e
graph
A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
He
r
land
Make
graph_next_li
n
e
() availab
l
e i
n
the
g
raph
.
h AP
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
re
v
ision: Turn
off history sim
p
l
if
i
c
a
tion in
-
-ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
revi
s
ion: Fix
typ
o
i
n
-
-
a
n
cestry-path error
m
essage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev-li
s
t-options
.
txt: Explain --ances
t
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev-list-o
p
tio
n
s
.
txt: Fix missing lin
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan
H
erland
diff
.
c: Ensu
r
e "i
n
dex $from
.
.
$to" line contain
s
unambig
u
ous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan He
r
land
builti
n
-notes: Minor (mostl
y
parse_options-rela
t
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n
H
e
r
lan
d
s
ub
m
odule summ
a
ry:
Don'
t
barf when in
v
oked in an e
m
pty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
ote
s
: Add "copy
"
subcomman
d
for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
bu
i
ltin-n
o
tes: Misc
.
re
f
actoring of
argc
and exi
t
value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
l
a
n
d
builtin-notes: Add
-
c/-C options for reu
s
ing n
o
te
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
l
and
buil
t
in-notes: Refactor
ha
n
dling of
-F
o
ption to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
He
r
land
bu
i
l
t
in-
n
otes: Deprecate t
h
e -m/-F options for "gi
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n
H
erland
b
u
iltin-no
t
es: Add "
a
ppend" subcommand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
built
i
n-notes: Add "add
"
subcommand f
o
r
addin
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uil
t
in-not
e
s
:
Add --message/--file aliases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
b
u
i
lti
n
-notes: Add
"list" s
u
bc
o
mmand for
l
i
sting note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Documentat
i
o
n
: Generali
z
e git-note
s
d
o
cs to '
o
b
jects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
builtin-notes: Add "prune" subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
t
e
s
API:
prune_notes(): Prune notes th
a
t belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n H
e
r
l
and
t3305: Verify t
h
a
t removing notes
t
r
i
ggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
uilt
i
n
-n
o
tes: Add "remove"
s
ubco
m
mand
f
or
r
e
moving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Tea
c
h bui
l
tin-not
e
s
to r
e
move empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Tea
c
h
n
otes c
o
de to properly pre
s
erve non
-
n
otes
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
t3305: V
e
r
ify th
a
t adding many not
e
s wit
h
git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
t3301:
Ver
i
f
y
s
uccessful annotation
o
f
n
o
n
-
commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
B
u
iltin-i
f
y
git-
n
o
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Refactor no
t
e
s
concat
e
nation into a flexible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
API: Allow
m
ultiple conc
u
rrent notes trees wi
t
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
API: write_n
o
tes_tree(
)
:
St
o
re the notes tre
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API
:
for_each_not
e
()
:
Traverse t
h
e entire n
o
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
Notes API: g
e
t_note()
:
Return the note annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: remove_note(): Remove note
objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
N
o
tes
A
P
I: ad
d
_note
(
):
Add n
o
te obje
c
ts to the internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API:
init_notes(): Initialize the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Add te
s
ts for chec
k
in
g
c
o
rrect handling of
$
G
IT_N
O
TES
_
R
E
F
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI: get_comm
i
t_notes()
-
>
f
o
rmat_note() +
remov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
M
inor co
s
metic fixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-config: Fix cra
s
h wh
e
n using "-
f
<rela
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
A
dd more testcases to te
s
t fast
-
impo
r
t
of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Her
l
and
Rename t9301
to
t9350, to make room for more
f
ast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fa
s
t-import: Proper no
t
es tree manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Joha
n
Herlan
d
Fix cr
a
sher on
enco
u
n
t
eri
n
g SHA1-like
n
on-not
e
in note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan He
r
l
a
nd
B
asic build infrastructu
r
e for Python sc
r
ipts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next