repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
notes: disallow reusing non-blob as a note object
2014-02-20
J
o
ha
n
Herland
notes:
d
isallow reusing
n
o
n
-blob as a note
object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
r
l
a
n
d
t3
2
00: Add test d
e
m
onstrating m
i
nor
re
g
ression in 41c2
1
f
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
r
l
a
nd
Refer to branch
.
<n
a
me>
.
r
e
mote/merge when
do
c
ument
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200: Minor fi
x
when preparin
g
f
or t
r
acking f
a
ilure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
land
t20
2
4: Fix &&-chaining
a
nd a
co
u
ple
o
f typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Her
l
and
M
ove create_notes_commit()
f
rom
n
ote
s
-
merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herland
Move copy_note_for_rewrite +
fri
e
n
ds from builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herland
fin
i
sh_copy_no
t
es_fo
r
_re
w
rite(): Let ca
l
ler provid
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
lan
d
glossary: Update and rephrase the defin
i
ti
o
n o
f
a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
h
a
n He
r
land
branch
.
c:
V
ali
d
at
e
t
r
acki
n
g branches
with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
ha
n
Herl
a
nd
t9114
.
2:
Don't use
--trac
k
option aga
i
nst "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
oh
a
n Herlan
d
t
7201
.
24: Add refspec
t
o
keep --track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
H
erland
t3200
.
39: tracking setu
p
should
fai
l
if there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
c
h
eckout: Use
remote r
e
fspecs whe
n
DWI
M
ming tr
a
c
k
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t2024: S
h
ow failure
to use ref
s
pec
w
hen DWIMming remot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
2024: Add tests verifying current DWIM behavio
r
o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
git
s
ymbolic-ref --d
e
lete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
n
d
Fix failure
t
o
delet
e
a p
a
c
k
e
d ref thr
o
ugh a
sy
m
r
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
e
rland
t1400
-
update-r
e
f: Ad
d
test
v
erifying bug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rla
n
d
not
e
s-m
e
rge: Don't remove
.
git/NOTES_M
E
RGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
n
ote
s
-merge:
use opendir/readdir in
s
tead
of
u
sing read_di
r
ec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t33
1
0:
i
llust
r
ate failure
t
o "notes merge --com
m
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast-import
:
Fix incorrect fanout level when
m
odifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
h
an
Herla
n
d
t9301: Add 2nd testcase ex
p
o
s
ing bu
g
s in
fast-im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix testca
s
e covering up a bug in fa
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan He
r
land
t
5400: Fix a couple of typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Her
l
and
Ma
r
k dirs
t
at error
m
essa
g
es for tran
s
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Improv
e
error han
d
ling
w
hen
p
arsin
g
d
irsta
t
para
m
ete
r
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
H
e
r
l
a
n
d
New --di
r
s
tat=lines
mode, doing dir
s
t
at
anal
y
sis b
a
s
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Allow
s
p
ec
i
f
ying --dirs
t
at cut-off
pe
r
centage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
c
on
f
ig variab
l
e
f
o
r speci
f
ying default --dirst
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herl
a
nd
Refactor --
d
irstat p
a
r
s
i
ng
;
deprecate --cum
u
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Mak
e
-
-dirstat=0 output direc
t
ories that c
o
ntr
i
b
u
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Add several testcases for --dirstat
an
d
f
r
iends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n
H
e
rla
n
d
-
-dirstat: In c
a
se of
r
enames,
u
s
e
t
arg
e
t
fi
l
e
n
ame
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
Teach --dirstat not to completely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--dirstat-by-file: Make it faster
a
nd
m
ore correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
--dirstat: Describe non-obvious d
i
ffe
r
ences re
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an Herland
Make "git note
s
ad
d
" m
o
r
e user-fr
i
endly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/prett
y
-options: Doc
u
m
en
t
--[no
-
]notes
a
n
d de
p
recate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
bran
c
h/chec
k
out --tr
a
c
k:
E
nsure that upstre
a
m bran
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Joha
n
H
e
rland
pus
h
.
default: Rename
'tracking' to
'
u
ps
t
ream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rlan
d
Provide 'git m
e
rge --abort' a
s
a sy
n
onym to 'git
r
es
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merg
e
():
P
a
rs
e
o
p
t
ions before ch
e
cking MERGE
_
HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Prov
i
de 'gi
t
n
o
te
s
get-ref' to ea
s
ily
retri
e
v
e current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git notes mer
g
e: Add testcases for m
e
r
g
ing
notes tr
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
r
land
git notes merge: Ad
d
an
o
th
e
r
au
t
o-res
o
lvi
n
g strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: --co
m
mit
s
hould fai
l
if
underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merg
e
:
List conflicting not
e
s in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes mer
g
e: Manual conflict resolution,
p
a
r
t
2
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
git notes
me
r
ge: Ma
n
ual conf
l
ict
r
esolution, part
1/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Documentation: Prel
i
minary
d
ocs
o
n 'g
i
t notes merge
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
git n
o
tes me
r
ge: Add automatic
con
f
lict
r
esolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes mer
g
e: Handle real, non-confli
c
ting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
builtin/notes
.
c: Re
f
actor cre
a
tion of
notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
gi
t
n
ot
e
s
m
er
g
e: Initial implement
a
ti
o
n handling tri
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
b
uiltin/n
o
t
es
.
c: Split
notes ref
D
W
I
Mmery into a
s
ep
a
r
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use two newlines
(instead
of o
n
e) when con
c
aten
a
tin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(tri
v
ia
l
) t
3
303: Inde
n
t w
i
th
ta
b
s instead o
f
space
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erland
notes
.
h
/c: Propagate
c
ombine_notes_fn re
t
urn va
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h/
c
: Allow combine_notes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
notes
.
c: Reord
e
r functions in
p
r
eparation for
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
n
o
t
es
.
h: M
a
ke default_notes_ref(
)
available in notes AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
(tr
i
vial) notes
.
h
:
Minor documentatio
n
fix
e
s to
c
o
p
y_not
e
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
n
o
t
e
s
.
c: Hexify SHA1 in die(
)
mess
a
ge from i
n
it_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't cre
a
te
(
empty) co
m
mit
when re
m
oving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
oh
a
n He
r
land
E
nable custom
s
chemes
for column colors i
n
th
e
graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
lan
d
Make
graph
_
next_line() available in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Turn off histo
r
y si
m
plificatio
n
in
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix
typo in --ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Doc
u
mentation/rev-list
-
options
.
txt: Explain
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rla
n
d
Do
c
umentation/re
v
-list
-
o
p
t
io
n
s
.
t
x
t
: Fix 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 $fr
o
m
.
.
$t
o
" line contains u
n
amb
i
gu
o
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herla
n
d
bu
i
ltin-notes: Minor (mostly parse_
o
p
t
io
n
s-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Her
l
and
s
ubmo
d
ule summary: Don't barf when invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Add "copy" subc
o
mmand for copying n
o
te
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Misc
.
re
f
actoring of arg
c
an
d
exit v
a
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
notes: Add -c/-C o
p
tions f
o
r reusing
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
buil
t
in-notes: Ref
a
ctor hand
l
in
g
of -F o
p
tion to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Deprecat
e
th
e
-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
bu
i
lti
n
-notes: Add "
a
ppend" subcommand for append
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
l
and
builtin-notes: Add
"
add
"
subcom
m
and for
adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
b
u
iltin-notes: Add --message/--file aliases for -
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herlan
d
builti
n
-no
t
es: Add "list
"
su
b
comman
d
fo
r
list
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Docum
e
n
t
a
t
ion: Generalize
git-
n
otes docs to '
o
bjects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-notes: Add "prune" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es API: prune_note
s
(): Prune note
s
that
b
elong
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
305: Verify that rem
o
ving
no
t
es trig
g
er
s
a
u
tomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d
"remove" subcommand for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Teach b
u
iltin-notes to r
e
move em
p
ty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Tea
c
h notes co
d
e to properly pre
s
erve non-
n
otes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t33
0
5: Verify that
a
dding man
y
not
e
s
with git-no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
t3301: Veri
f
y successful annot
a
tio
n
of no
n
-com
m
its
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Builtin-ify
g
i
t
-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
R
efactor not
e
s concat
e
nat
i
o
n
into a f
l
exible
i
nterfac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an He
r
l
a
n
d
N
o
tes API: Allow mult
i
ple conc
u
rrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es API: wr
i
t
e
_notes_tr
e
e(): Store the
n
o
tes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: for_ea
c
h_note(): Traverse t
h
e
entir
e
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
get_note():
Re
t
urn the note
a
nnotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n H
e
rland
Notes API: remove_note(): Remove note o
b
j
ects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next