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
Provide 'git notes get-ref' to easily retrieve current notes ref
2010-11-17
Jo
h
an Herland
Provide 'git
n
o
tes get-r
e
f'
t
o
e
a
sily retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes
m
erge: Add
test
c
ases for merging no
t
e
s
trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
g
i
t
notes merge: Ad
d
another auto-r
e
sol
v
i
ng strateg
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merge: --commit should fail
if under
l
ying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git no
t
es merg
e
: List confl
i
cting notes in note
s
merg
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
git note
s
merg
e
: Manua
l
c
onflict resolution
,
part 2/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manua
l
con
f
lict r
e
solution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Documen
t
a
ti
o
n: Preliminary do
c
s on 'git note
s
merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
notes
m
erge: Add automati
c
con
f
lict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
g
i
t notes m
e
rge: Handle real, non-conflicting no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin/notes
.
c: Refactor creation
of notes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herlan
d
g
i
t notes merge: Initia
l
implementation
h
andl
i
ng trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
buil
t
in/notes
.
c: S
p
lit note
s
r
ef DWIMm
e
ry into a se
p
arat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rland
notes
.
c: Use two new
l
ines (inste
a
d of one)
wh
e
n concatenat
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herla
n
d
(
t
rivial) t
3
303
:
I
n
dent wit
h
t
abs instead
o
f s
p
aces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
notes
.
h/c
:
Pr
o
pagate combine_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herla
n
d
notes
.
h/
c
: Allow combine_no
t
es functi
o
ns to
remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Reorder f
u
nc
t
ions in preparation for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
h: Mak
e
default
_
notes_ref() a
v
ailab
l
e in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) n
o
te
s
.
h: Minor do
c
umentati
o
n
f
ixes to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
c:
Hexify SHA1
in
die() m
e
s
sage
f
rom init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
e
vision:
T
u
rn off
h
i
story
s
i
m
plification in --ancestr
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
on
:
F
i
x
typo in --ancestry-
p
ath error messag
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
Docu
m
entat
i
on/rev-list-o
p
tions
.
txt:
Ex
p
l
a
in --anc
e
st
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
ocumentation/re
v
-list-op
t
ions
.
t
x
t:
F
i
x
mis
s
in
g
line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan He
r
la
n
d
d
i
ff
.
c: En
s
u
re "
i
ndex
$
f
rom
.
.
$
t
o" line cont
a
ins
unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
b
u
ilti
n
-note
s
: Minor (most
l
y p
a
r
s
e_op
t
i
ons-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule summary: Don't
barf
w
h
e
n
i
n
voked i
n
an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Add "copy
"
subcommand f
o
r copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herlan
d
buil
t
i
n
-notes
:
Mi
s
c
.
re
f
actoring of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
built
i
n-
n
otes
:
Add -c/-C options for reusing
n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Refactor handling of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Deprecate the -m/
-
F
options for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "append" subcomman
d
fo
r
appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
bu
i
ltin-
n
otes: Add "add" subcommand
for adding n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uilt
i
n
-
notes: Add --mes
s
age/--file alias
e
s for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
b
u
iltin-
n
ote
s
: Add "
l
is
t
"
s
ubcommand for
lis
t
ing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentat
i
on:
G
eneralize git-not
e
s
docs t
o
'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-notes: Add "prune" subc
o
mma
n
d
for r
e
mov
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
Notes
A
P
I: pr
u
ne_notes(
)
: Prune
n
otes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305:
V
erify that r
e
m
o
vi
n
g notes trig
g
ers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
H
e
rland
built
i
n-notes:
A
dd
"r
e
move"
sub
c
ommand for removi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach builtin-notes
t
o
remove empty no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Tea
c
h notes code to pro
p
e
r
ly
p
reserve
non-notes
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t330
5
:
Verify
t
hat adding many not
e
s with gi
t
-
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n He
r
land
t3301: Ve
r
ify successful annotation of non-
c
o
mmi
t
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
B
uiltin-ify g
i
t-n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refa
c
tor n
o
te
s
concatenatio
n
into
a flexib
l
e interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
Notes API: Al
l
ow m
u
l
tiple concurrent notes tr
e
es
w
ith
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Her
l
and
N
otes API: write_not
e
s_tree(): Store the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I: for_each_note(): Traverse the en
t
ire not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API:
get_n
o
te(): Return the note annotatin
g
the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
N
o
tes API:
r
e
m
ov
e
_n
o
te():
Remove
note obj
e
cts
f
rom
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
He
r
land
N
otes API
:
ad
d
_note(
)
:
A
dd no
t
e o
b
j
ec
t
s
to the internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: init_notes(): Ini
t
ialize
t
he n
o
tes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herl
a
nd
Ad
d
t
e
sts for checking
c
orrect handling o
f
$
GIT_NOTES
_
REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
N
ote
s
API: g
e
t
_
com
m
it_
n
otes(
)
-> format_n
o
te() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
M
inor cosmet
i
c fixes t
o
n
o
tes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Joh
a
n Herland
builtin-confi
g
: Fix crash when using "-f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
o
h
an H
e
r
l
a
n
d
Add m
o
re testcases to test fast-import of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rena
m
e t93
0
1 to t9350, to
m
ak
e
r
o
om for more fast-i
m
por
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an H
e
rland
fa
s
t-impor
t
: P
r
oper notes
tree manip
u
lation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix c
r
asher
on encountering SHA1-like no
n
-note in n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic b
u
ild infrastructur
e
for Python scr
i
p
t
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
dd
selftests ver
i
fying con
c
a
te
n
ation o
f
multiple n
o
te
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
Refactor notes
code
to con
c
atenate mul
t
ip
l
e notes annot
a
ti
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
H
erl
a
n
d
Add selftests
v
erifyi
n
g th
a
t
w
e
c
an parse no
t
es trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach the
n
otes loo
k
up code to parse notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
rlan
d
Teach notes code
t
o f
r
ee its inter
n
al data structures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
oh
a
n Herland
Add f
l
ags
t
o get_commit
_
notes() to contro
l
t
he format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
a
n
d
t
3302-notes-i
n
dex
-
expensive
:
Speed up c
r
eate_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
fast-import: Ad
d
s
u
pport for impo
r
ting commit note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an
H
er
l
and
Teach "
-
m <msg>"
and "-F <fi
l
e>" to "g
i
t no
t
es edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Joh
a
n Her
l
and
git clon
e
:
Add --recursive
t
o aut
o
mat
i
cally checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Jo
h
an Herla
n
d
t7407: Use 'rev-parse --sho
r
t' rather th
a
n
b
ash's substri
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
g
i
t submodule statu
s
: A
d
d --recursive
t
o recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
g
it
s
ubmodule update
:
I
ntroduce --recursiv
e
to update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n Herl
a
nd
g
i
t submod
u
le
fore
a
ch
:
Add --rec
u
rsive
t
o recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herl
a
nd
gi
t
s
u
b
mo
d
ul
e
fo
r
e
ach: test
access to s
u
bmodule name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
Add selftest
for
'git submodu
l
e foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submod
u
le: Cleanup usag
e
strin
g
and a
d
d o
p
tion
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Joha
n
Herlan
d
g
i
t sub
m
o
d
u
l
e
f
ore
a
ch: Provide
acce
s
s to s
u
bmod
u
le
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Johan Herland
he
l
p
.
c
:
give c
o
rrect
s
tructur
e
's size to mem
s
e
t
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Johan
H
erland
quickfetch(): Prevent overflow of the rev-
l
ist
com
m
and
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan
H
e
rland
git-submo
d
u
le: add support for --merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Joha
n
Herland
Rename
s
ubmodule
.
<n
a
me>
.
rebase to
s
ub
m
odule
.
<nam
e
>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
Update
d
ocs on b
e
haviou
r
of 'co
r
e
.
sharedRepository
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Jo
h
an Herland
Move chmod(foo,
0
444) int
o
move
_
temp_to_
f
i
l
e()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
Joh
a
n
H
e
rland
Use strchrnul()
i
nstead of strc
h
r
() p
l
us manual workaround
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Her
l
and
Fix
submodule sync with
r
e
l
ative
sub
m
odule U
R
Ls
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Jo
h
an Herland
for-ea
c
h-ref: F
i
x --forma
t
=
%
(subject
)
for log me
s
s
a
ge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
Joh
a
n
H
erland
Fix AsciiDoc errors in me
r
ge
d
ocumentatio
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-02
Johan Herl
a
nd
Bring local clone's origin URL in line wit
h
that of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-08-21
Johan He
r
land
T
e
ach "git diff
-
p" HTML func
n
ame patte
r
ns
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Teach "g
i
t clone"
t
o pack
r
e
fs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Jo
h
an Her
l
and
Pre
p
a
re
t
est
s
ui
t
e
f
o
r a "git
clone
"
th
a
t
pa
c
k
s
refs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Joh
a
n He
r
land
Move pack_refs() and f
r
i
e
nds in
t
o
libgit
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Incorporate fetched packs in
f
u
ture o
b
ject traversal
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herland
The "
c
u
r
l" executable is no long
e
r r
e
quir
e
d
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-15
Johan
H
erland
Cons
i
stency: Use
"lib
c
u
rl" ins
t
ead of "cURL library
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next