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
log/pretty-options: Document --[no-]notes and deprecate old notes options
2011-03-30
Johan
Herland
log/pretty-options: Document --[no-]notes and dep
r
ecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an He
r
land
branch/che
c
k
o
ut --tr
a
ck: Ens
u
re that upstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
J
ohan Herl
a
nd
pus
h
.
defa
u
lt: Rename 'tracking
'
to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide '
g
it m
e
rge --abort'
as a synon
y
m
to 'g
i
t reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
e
rl
a
nd
cmd
_
merge(
)
: Parse
o
p
tions before checking MERG
E
_HE
A
D
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
Provide 'g
i
t notes
g
et-
r
e
f
'
to easily retrieve cu
r
rent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es m
e
rge
:
Ad
d
tes
t
cases for merging not
e
s trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merge: Add another auto-
r
esolving
strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git not
e
s
m
erge: --commit should
fail if unde
r
l
y
in
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t no
t
es merge: List confl
i
cting note
s
in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
g
it n
o
tes merge: Man
u
al conflict resoluti
o
n
, part 2
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes merge: Manua
l
c
o
nflict resolution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
la
n
d
Doc
u
me
n
t
a
t
ion: Preli
m
in
a
ry docs on
'
git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: Add automa
t
ic conflict res
o
lvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
Herland
gi
t
n
otes merge: Handl
e
rea
l
, non-conflicting n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
b
u
iltin/no
t
es
.
c: Re
f
acto
r
creation of notes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes me
r
ge: In
i
t
ia
l
implemen
t
ation hand
l
in
g
trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
built
i
n/notes
.
c
:
Spl
i
t not
e
s ref DWI
M
mery
i
n
t
o a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
an
d
notes
.
c:
U
se two ne
w
l
ines
(
i
nstead
of one)
whe
n
concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(trivial) t33
0
3: Inden
t
with ta
b
s instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
notes
.
h/c: Propaga
t
e
combin
e
_notes_fn
ret
u
rn value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
oh
a
n Herland
no
t
es
.
h/c: Allow c
o
mbine_note
s
functions to rem
o
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c: Reorder functions in p
r
epar
a
tion for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h
:
M
ake default_notes_ref(
)
available in
notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
(trivial) note
s
.
h:
M
inor
d
ocumentation fixes to copy_no
t
es()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hex
i
fy SHA1 in d
i
e() message from init_note
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan Herland
n
otes: Don't creat
e
(emp
t
y)
c
ommi
t
when removi
n
g n
o
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
E
n
a
b
l
e
c
ust
o
m sc
h
emes for
c
olumn colors in the graph AP
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
M
a
ke graph_ne
x
t
_line() available in the gr
a
ph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n
Herland
revision
:
Tur
n
o
ff history
simplification
in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han
H
erland
rev
i
sion: Fix
t
ypo i
n
--a
n
cestry-
p
at
h
error me
s
s
age
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
Documentation/rev-list-opt
i
ons
.
txt: Explain --ance
s
try
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
o
cumentat
i
on/rev-li
s
t-options
.
t
xt
:
Fix missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Joha
n
Herland
d
i
ff
.
c: Ensure "index $from
.
.
$t
o
" line contains unambig
u
ous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herla
n
d
built
i
n-notes: Minor (mostly p
a
r
s
e_
o
ptions-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
oha
n
Herland
s
u
b
m
od
u
l
e
summary: Don't barf when i
n
voked in an em
p
ty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "copy" subcommand for copying n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uilti
n
-note
s
:
Misc
.
refa
c
torin
g
o
f
argc and
exit
value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes:
A
dd -c/-C
options for reusing
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
builti
n
-not
e
s: Refact
o
r handli
n
g of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Depreca
t
e the -m/-F o
p
tion
s
for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-note
s
: A
d
d "appe
n
d" subcomma
n
d for
appe
n
di
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builti
n
-
n
otes: Add "add" subcomman
d
for
ad
d
ing notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add
--message/--file a
l
iases f
o
r -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builti
n
-
n
o
t
e
s:
A
dd "list" subcommand for
l
i
sting
n
o
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
Documenta
t
ion:
G
eneralize git-no
t
e
s
do
c
s to '
o
bjects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
builtin-n
o
tes: Add
"
pru
n
e
"
sub
c
o
m
mand
for re
m
oving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
e
s API: p
r
une_notes(): Prune
n
ote
s
tha
t
b
e
l
o
ng to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t33
0
5
: Verify that removin
g
notes t
r
iggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
bu
i
ltin-notes: Add "re
m
ove" subco
m
mand fo
r
re
m
ovi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
b
u
iltin-notes to remove empty no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Teach not
e
s co
d
e t
o
properly
p
reserve
non-no
t
es in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
0
5: Verify that adding ma
n
y
n
otes with git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t3301: Verif
y
successful annotation of
non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Builtin-ify git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Re
f
actor n
o
tes concatenation int
o
a fl
e
x
ibl
e
i
nterfa
c
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
No
t
e
s API: All
o
w
m
ult
i
ple c
o
n
c
u
r
r
e
nt notes
t
rees w
i
th
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI:
w
rite_not
e
s_tree():
S
tore the note
s
t
r
ee
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes API: for_each_note(): Traver
s
e the e
n
tire n
o
t
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API: get_no
t
e(): Return t
h
e not
e
ann
o
t
ating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes
A
PI: remove_no
t
e(
)
: Remove note object
s
f
r
om
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
No
t
es API: a
d
d_note(): Add
n
ote
objects to the
i
nterna
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes A
P
I: init_notes
(
): Init
i
a
lize th
e
n
o
t
e
s
tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Ad
d
t
ests fo
r
chec
k
i
n
g correct
h
an
d
ling o
f
$GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_commit_notes() -> for
m
at_note()
+
remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosme
t
ic
f
i
x
es to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
J
ohan
Herland
builtin-conf
i
g
:
F
ix crash
when
u
sing "-f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
H
e
rland
Add mor
e
te
s
tcase
s
to test fa
s
t-import of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Her
l
and
Rename
t9
3
01 to t9350,
t
o
m
ake room for
m
ore fast-imp
o
rt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
a
n
Herland
f
a
st-imp
o
rt:
Prop
e
r
n
o
tes tree ma
n
i
pulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan
He
r
land
Fix cr
a
s
her on e
n
cou
n
tering SHA1
-
like non-
n
ote in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan H
e
rland
B
a
sic build infrastructure for Python scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Add selfte
s
ts verifying
concatenat
i
on of
m
ult
i
ple
n
o
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refactor notes c
o
de
to concatenate multiple n
o
tes annotating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add
s
elftests
v
erifying th
a
t we
can parse n
o
tes
trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
Teach the notes
l
o
ok
u
p code
t
o parse
n
o
tes
trees
w
ith
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
T
each notes code
t
o fre
e
its interna
l
data structures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herl
a
nd
Add flags t
o
get_commi
t
_notes() to contro
l
the format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
t330
2
-notes-in
d
ex
-
expensive: Speed
up create
_
re
p
o()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
fast-impor
t
: Add
s
upport
f
or im
p
orting co
m
mit notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
Herland
T
e
ach
"
-m <msg>" and "-F
<file>" to "git note
s
edi
t
"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
g
i
t clone: Ad
d
--recurs
i
ve to automa
t
ica
l
ly
c
heckout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t740
7
:
Use 'rev-parse --shor
t
' rather than bash'
s
substring
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan Herl
a
nd
git
s
ubmodule
s
t
a
tus: Add --re
c
ursive to
recu
r
s
e in
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herl
a
nd
git submodule update: Introduce --recur
s
ive to
upda
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herland
g
it submodul
e
foreach: A
d
d --rec
u
r
s
ive to rec
u
rse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule
foreach: test access
t
o
submodu
l
e name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herland
A
d
d sel
f
test
f
o
r
'
g
i
t submodule foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
g
it sub
m
odule
:
Cleanup usage string and a
d
d opt
i
o
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
J
ohan Herland
git
s
ubmodule foreach: Provid
e
access
to submodule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Johan Herla
n
d
help
.
c
: give
cor
r
ec
t
struc
t
ur
e
's size to memset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Joha
n
H
e
rla
n
d
quic
k
fetch(): P
r
event
o
v
erflow
of
t
he
rev
-
l
i
s
t c
o
mmand
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan H
e
rl
a
nd
git-submodul
e
: add suppo
r
t
f
o
r --
m
erge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan
H
erland
Rename s
u
bmo
d
ule
.
<name>
.
reb
a
se to submodule
.
<name>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Jo
h
an Herland
Up
d
ate docs on behaviour of 'core
.
sharedReposi
t
ory
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herlan
d
Move chmod(foo
,
0444) into mo
v
e_temp_to_file()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
Jo
h
an Herland
Use strchrnul()
inste
a
d
o
f
st
r
chr() plus
manu
a
l wo
r
karound
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
Fix
s
ubmodule s
y
nc
w
it
h
relative submodule
U
RLs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
J
ohan Herland
f
or-each-ref: Fix --format=%(sub
j
ect) for log message
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
Johan
H
erland
Fix As
c
iiDo
c
err
o
rs in merge documentation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next