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
git notes merge: Handle real, non-conflicting notes merges
2010-11-17
Johan H
e
rlan
d
git notes merge: Handle real,
n
on-confl
i
cting n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bui
l
tin/n
o
te
s
.
c:
Refactor creatio
n
of notes com
m
its
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git
n
otes merge:
I
nitial implementati
o
n h
a
ndli
n
g
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
builtin/n
o
tes
.
c:
S
plit n
o
te
s
ref DWIMmery
into
a s
e
parate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
notes
.
c: U
s
e two
new
l
in
e
s (instead of
o
n
e)
when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erland
(
t
r
ivial) t3303:
I
ndent
wit
h
ta
b
s instead o
f
s
paces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
h/c: Propagate com
b
ine_notes_fn r
e
t
ur
n
valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
h/c: Allow comb
i
ne_note
s
functi
o
ns to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
c: Reorder func
t
ions
i
n pr
e
pa
r
ation
f
or next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
h
: Make default_notes_ref() available i
n
notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
(tri
v
ial)
n
o
tes
.
h:
M
i
n
o
r documentation fixes to
copy_
n
otes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
n
o
tes
.
c
: H
e
xi
f
y
SHA1 in die() m
e
s
s
age from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
re
v
ision:
Tu
r
n
of
f
hi
s
t
o
ry
s
impli
f
ication in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan H
e
rla
n
d
revision:
F
ix typo i
n
-
-ancestry-path error messag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
ha
n
Herlan
d
Docume
n
t
a
tion/rev-
l
ist
-
op
t
ions
.
txt: Expl
a
in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
Documentation/rev-list-options
.
txt: F
i
x
mi
s
s
i
ng line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
d
i
ff
.
c:
E
n
sure "
i
n
d
ex $fr
o
m
.
.
$
t
o"
l
ine contains unambig
u
ous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an Herland
builtin-not
e
s:
M
inor (mostly parse_opti
o
ns
-
rel
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan H
e
r
land
submodule su
m
mar
y
: Don
'
t barf w
h
en invoked
i
n an emp
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
builtin-
n
otes: Ad
d
"copy" sub
c
ommand for
c
opying
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
builtin-notes: Misc
.
refactor
i
ng of argc a
n
d exit
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
built
i
n
-
no
t
e
s
:
Add -c/-C options fo
r
re
u
sin
g
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
Refact
o
r handling of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
builtin-no
t
e
s: Dep
r
ecate t
h
e -m/-F opti
o
ns f
o
r "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
b
u
iltin-no
t
es: Add "append" s
u
bcommand for ap
p
e
nding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add "add" sub
c
omman
d
f
or
adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
builtin-
n
ote
s
:
Add --message/--f
i
le aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
bu
i
ltin-notes
:
Add "list"
s
ubcomm
a
nd for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
D
o
c
u
mentation:
G
e
neralize git-not
e
s
docs to
'
objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-
notes:
Add "prune" su
b
command
f
or remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
Not
e
s
AP
I
:
p
ru
n
e_notes
(
): Prune notes t
h
a
t belong t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305: Verify tha
t
removing notes triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
bu
i
ltin
-
notes: Add "remove" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach b
u
iltin-not
e
s t
o
remove
e
m
pty not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes
code to pro
p
erly preserve non-notes
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t3305: Verify that adding man
y
notes with g
i
t-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Ver
i
fy
s
uccessful
annotati
o
n of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Builtin-ify git
-
note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
r
l
and
Re
f
acto
r
no
t
e
s
conc
a
tenation into a
f
le
x
ibl
e
in
t
erfac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: Allow mu
l
tipl
e
concurre
n
t no
t
es trees wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
Notes API: write_notes_tree():
S
tore the n
o
tes
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n H
e
r
l
a
nd
Notes API: f
o
r_each_note(): Traver
s
e the entir
e
no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
: get_no
t
e
(
): Return the note an
n
o
t
ati
n
g the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
N
otes API: remove_note(): Remove note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
No
t
es
A
P
I:
a
dd_note
(
): A
d
d note obje
c
ts to th
e
internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: init_notes(): Init
i
alize the n
o
tes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
A
d
d
tests for c
h
e
c
kin
g
correc
t
handling of $GIT_NOT
E
S_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Her
l
a
n
d
No
t
es API: get_commit_no
t
es() -> format_note() + remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Min
o
r c
o
smetic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joha
n
Herland
b
uiltin-config:
F
ix cra
s
h when using
"
-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herland
A
d
d more
t
est
c
a
s
es to test fast-import of note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
Rename
t930
1
t
o t93
5
0, to make room for
more fast-imp
o
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
f
ast-im
p
ort: Proper n
o
t
e
s tree manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Jo
h
an
Herla
n
d
Fix c
r
asher on
e
ncountering SHA1-l
i
ke no
n
-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Bas
i
c build infrastru
c
ture
for Python scri
p
ts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han
Herl
a
n
d
Add selft
e
st
s
verifyin
g
concate
n
a
t
ion of mult
i
ple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refactor
n
otes code to concate
n
ate m
u
lti
p
l
e notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add selftests verif
y
ing t
h
at we
can parse not
e
s
tre
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
rland
Te
a
ch the
n
otes l
o
okup c
o
de to parse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Teach not
e
s code to free it
s
int
e
rnal data
s
tr
u
ctures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add flags to
ge
t
_commit_no
t
es(
)
to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
t3302
-
notes
-
i
n
d
e
x-expensive
:
Speed
u
p
c
r
e
ate_
r
epo
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fast-
i
mport: Add suppo
r
t fo
r
i
mporting commit note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n He
r
l
and
Teach "-m <msg>" and "-
F
<file>"
to "git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Jo
h
an
H
erland
git clone: Add --rec
u
rs
i
ve to automatica
l
ly checkou
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan He
r
land
t
7407:
U
se 'rev-pa
r
se --shor
t
' r
a
ther t
h
a
n
bash's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
He
r
land
git submodule
s
tat
u
s:
Add --recu
r
si
v
e to rec
u
rs
e
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
a
nd
g
i
t s
u
bm
o
dule update: Introduce --
r
ecur
s
i
v
e to update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
a
n Herland
git submod
u
le foreach: Add --r
e
c
ursive
t
o recurs
e
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
r
land
git submodule foreach: test acces
s
to s
u
bmodule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herla
n
d
Add se
l
ftes
t
for 'gi
t
submodul
e
fore
a
c
h'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git
submodule: Clean
u
p usage string and add opt
i
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan H
e
rland
git
submodule foreach: Pro
v
ide
access to submo
d
ule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
J
ohan Herla
n
d
help
.
c: give correc
t
structure's size t
o
memset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quickfetch():
P
r
event ove
r
f
low of the rev-list com
m
a
nd
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan
Herland
git-submodule:
a
d
d
support
f
or --merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Joh
a
n Herland
Rename submodule
.
<n
a
me>
.
rebase to s
u
bmodule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
J
o
han Herland
Up
d
ate d
o
c
s o
n
be
h
av
i
our of 'core
.
sha
r
edR
e
pository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
Move chmod(foo, 0444
)
i
n
to move_te
m
p_t
o
_
file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Joha
n
Her
l
and
Use strchrnul() in
s
tead
of strchr() plus manual workaround
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herla
n
d
Fix submodule sync wit
h
relative submodule URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
for-each-re
f
: Fix --fo
r
mat=%(
s
ubject) f
o
r log me
s
sage
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan
Herl
a
nd
F
i
x
AsciiDoc errors in merge documentation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Johan Herla
n
d
Bring local
c
lone's
o
r
igin
URL
in l
i
ne
w
ith
that
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herland
Teach "
g
it diff -p
"
HTM
L
funcna
m
e
pattern
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Teach
"gi
t
c
lone
"
to pack r
e
fs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
J
oh
a
n
Her
l
and
P
r
epare
t
ests
u
i
t
e for a
"
git clon
e
" that packs refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan H
e
rland
Mo
v
e pack_refs() a
n
d friends into lib
g
it
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Joha
n
Herlan
d
In
c
orporate fe
t
c
hed packs in
f
u
t
u
r
e object trave
r
sal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
J
o
han Herland
T
h
e "c
u
rl
"
exec
u
table
i
s no longer required
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herla
n
d
Consisten
c
y: Use
"libcurl"
i
nstead of
"cURL library
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
J
ohan
Herland
c
p
io is no longer used by gi
t
-clone
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
J
o
h
an Herland
Add te
s
t for cloning with "--reference" repo b
e
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan Herla
n
d
Ad
d
a te
s
t for another combination of
-
-
r
eference
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
J
ohan Herland
Fix 'git
c
vsexportco
m
mit -w $cvsdir
.
.
.
' when used
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Johan Herl
a
nd
Add
t
estc
a
se fo
r
'
g
i
t
c
vs
e
xpo
r
tcommit -w $cvsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
Johan Her
l
and
Fix 'git
cvsex
p
o
r
tc
o
mm
i
t -w
$cvsdir
.
.
.
' when used
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
Johan
H
erland
Add
t
e
stcase
f
or 'git
c
vsexpor
t
commit -w $cvsdi
r
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2007-10-03
Johan Herland
Me
n
tion 'cpio' dependency
i
n INS
T
ALL
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2007-06-09
J
ohan H
e
rland
Re
m
o
ve u
n
n
e
c
e
ssary code and commen
t
s on no
n
-existing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next