repo.or.cz
/
git
/
mjg.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
J
o
h
a
n H
e
rland
git no
t
es merge:
Han
d
le
rea
l
,
non
-
con
f
licting
no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
builtin/notes
.
c
:
Refactor creatio
n
of notes co
m
m
i
ts
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
land
g
it notes merg
e
: I
n
it
i
al implementation
hand
l
ing t
r
ivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin/notes
.
c:
S
p
l
it no
t
es ref DWIMmery into a s
e
p
a
rate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
He
r
land
n
ot
e
s
.
c:
U
se tw
o
newline
s
(
i
nstead of one)
when concaten
a
t
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3303
:
In
d
ent with tabs i
n
stead of
spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
e
r
land
notes
.
h/c:
Propaga
t
e
c
ombine_not
e
s
_fn return va
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
no
t
es
.
h
/c:
Allow
c
o
mb
i
ne_notes functio
n
s to
r
e
move
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n He
r
land
notes
.
c
:
R
e
or
d
er
f
un
c
t
i
ons in preparation
for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
ha
n
Herl
a
nd
notes
.
h: Make d
e
fault_notes_ref
(
)
avai
l
able in
n
ot
e
s API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivi
a
l) n
o
tes
.
h: Minor
d
ocumentation fixes to
c
opy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
er
l
and
notes
.
c: H
e
xi
f
y
S
H
A
1 in di
e
() message from init_note
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revision:
T
urn off histo
r
y simplific
a
tio
n
in
--ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revi
s
i
o
n
:
Fi
x
typo in --ancestry-path e
r
r
o
r message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
Doc
u
mentation
/
rev-list-options
.
tx
t
: Explain --an
c
e
stry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docu
m
entatio
n
/
r
ev-list-options
.
txt:
F
ix
missing
l
ine
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Joha
n
Herla
n
d
d
iff
.
c: Ensure "index $from
.
.
$
to"
l
i
n
e contains
u
nambiguou
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Joh
a
n
H
e
rland
builtin-notes: Minor (mostly parse_options-rela
t
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
o
h
an Herland
submo
d
ule summary:
D
on't
barf when
i
nvoked in
a
n empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Add
"copy
"
s
u
b
comman
d
for cop
y
ing
n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
nd
builtin-notes: Misc
.
refactoring
of a
r
gc an
d
e
x
it value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
:
Add -
c
/
-
C option
s
for reu
s
ing not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
buil
t
i
n-
n
o
t
es:
R
efactor handli
n
g of -
F
opt
i
o
n to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-n
o
tes: Depre
c
a
te the
-m/
-
F op
t
ions for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Add "app
e
nd" subcommand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
la
n
d
b
uiltin-notes: Add "add" subcommand for
a
d
di
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-not
e
s
: Add --messa
g
e/
-
-file aliase
s
for
-
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
b
uiltin-notes: Add "list" subcom
m
and for lis
t
ing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentation: General
i
ze git-no
t
es do
c
s to 'o
b
jects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
builtin
-
n
o
t
e
s: Ad
d
"
p
rune" subcommand for
remov
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
N
otes API:
prun
e
_notes(): Prune not
e
s that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t3
3
05:
V
erify
that remo
v
ing notes
t
riggers
autom
a
tic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-
n
otes: Add "remove" subcommand
f
or
r
emoving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
an
d
Teach builtin-notes to remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Teach
n
ot
e
s c
o
d
e to
properly preserve non-note
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
a
n
d
t3305: Verify that a
d
di
n
g many not
e
s wit
h
g
it-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verif
y
successful anno
t
ation of non-com
m
its
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
B
uiltin-ify git-
n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Re
f
act
o
r
note
s
c
onca
t
e
n
a
tion into a flexi
b
le inte
r
face
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Note
s
API: All
o
w multip
l
e concurren
t
notes trees wi
t
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
No
t
e
s A
P
I
:
w
r
ite_notes_tre
e
(): Store t
h
e notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
Notes
AP
I
:
for_each_note(): T
r
ave
r
se the enti
r
e
note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
get_no
t
e(): Ret
u
rn the note
annotatin
g
the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: re
m
ov
e
_note():
Remove n
o
te
object
s
f
rom
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API: add_note(): Add
note objec
t
s t
o
the int
e
rna
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes AP
I
:
init
_
notes(): Initi
a
lize
the notes
t
ree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
Add tests for ch
e
cking
correc
t
handling of $GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
Note
s
API
:
get_commit_
n
ot
e
s
(
)
-> forma
t
_n
o
te()
+ remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmetic
f
ixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan He
r
lan
d
builtin-
c
onfig:
Fix crash wh
e
n using "-f <rela
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herland
Add more testcases to test
f
ast-
i
mport of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
rland
R
e
name t93
0
1 to t
9
350,
t
o
make room
for more fast-i
m
port
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
Herland
fast-import: P
r
oper notes tre
e
manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Joha
n
Her
l
a
n
d
F
i
x
c
rasher
o
n encountering SHA
1
-
like n
o
n-note in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Her
l
an
d
Basic bu
i
ld i
n
fr
a
structure fo
r
Py
t
hon scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
dd selftests
v
erifying c
o
nc
a
tenation
of
multipl
e
n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an Herland
R
ef
a
ctor
n
o
tes co
d
e to concatenate multiple notes annotat
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Ad
d
selftests ver
i
fyi
n
g that we can
pa
r
se not
e
s tree
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an Herla
n
d
T
each the no
t
es lookup cod
e
to
p
arse notes trees
w
i
th
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teac
h
notes code
to free
its internal data st
r
uctures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan H
e
rland
Add f
l
ags to
g
et_commit_no
t
e
s
(
) to control the format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
t3302-notes-in
d
ex-e
x
pensive: Speed up c
r
eate_
r
epo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan
H
erla
n
d
f
a
s
t
-impo
r
t: Add
su
p
port for
importing com
m
it not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
e
ach "-m
<
m
sg
>
" and "-F <file>"
t
o "
g
it notes edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
J
oha
n
H
e
rland
git clone: Add --recursive
t
o automaticall
y
checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
J
o
han Her
l
and
t
7
4
0
7: Us
e
'rev-pa
r
se --short
'
rathe
r
than bash's substring
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan He
r
land
git
subm
o
d
u
le status: Add --recursi
v
e
to recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
an H
e
rland
git
s
ubmodule
update:
In
t
rod
u
ce
-
-r
e
cursiv
e
to update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an
H
erla
n
d
git submodul
e
forea
c
h: A
d
d
--recursi
v
e
t
o recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herl
a
nd
git
s
ubmod
u
le f
o
reach: test
a
ccess
t
o submo
d
ule name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
A
dd selft
e
st for
'
git
submodule forea
c
h
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git su
b
module:
C
l
e
a
n
u
p usage strin
g
and add o
p
tion
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Joha
n
Herland
git
submodule
foreach: Provide ac
c
ess
to s
u
bmodule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Johan Her
l
a
n
d
help
.
c: give c
o
rrect
s
t
r
uct
u
re's
s
ize to memset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quickfetch(): Prevent overflow of th
e
rev-l
i
st comman
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan
H
erland
gi
t
-subm
o
d
u
l
e: add sup
p
ort
f
or --merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
J
ohan Herland
Rename submodule
.
<
na
m
e>
.
rebase to
s
ubm
o
du
l
e
.
<name>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
J
o
h
an
H
e
r
land
Update d
o
cs on behaviour of 'core
.
s
ha
r
edRepository
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Jo
h
an Herland
Move chmod(foo, 0444
)
into move
_
t
e
mp_to_file()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
Joh
a
n Herland
Use
s
t
r
chr
n
ul() inst
e
ad o
f
strchr() plus manual workaround
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
J
o
h
a
n Herland
Fix submodule sy
n
c with r
e
lative subm
o
du
l
e URLs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
for-each-ref: Fix --format=%(
s
ubject) for
l
o
g mess
a
ge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
Joha
n
Herland
Fix Asci
i
Doc
e
rro
r
s in merge documentation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-02
Johan
Herland
B
ri
n
g local clone'
s
orig
i
n
U
RL in line with th
a
t of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-08-21
Johan
H
erland
Teach "git d
i
f
f -p" HTML funcname patt
e
r
n
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
J
o
ha
n
Herland
T
each "gi
t
cl
o
ne
"
t
o pack refs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
J
o
han
Her
l
and
Prep
a
re testsuit
e
for a "g
i
t
clone" that packs refs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herl
a
n
d
Move pack_ref
s
() and friends
into l
i
bgit
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Jo
h
a
n Herland
Incorporate fetched packs
i
n future
o
bject traversal
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herland
The
"curl" executab
l
e i
s
no l
o
nge
r
required
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herland
C
onsistency: U
s
e "libc
u
rl" instead of "cURL library
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-15
Joh
a
n He
r
land
cpio is no lo
n
ger used b
y
git-clone
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-05-23
Johan He
r
la
n
d
A
dd t
e
st for cloning with "--
r
efer
e
nce" repo being
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-05-23
Joh
a
n Herl
a
nd
Add a test for another combi
n
at
i
on of --
r
eferenc
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-02-27
Jo
h
an Herland
Fix 'git cvs
e
xportcommit -
w
$
cv
s
dir
.
.
.
' when used
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-02-27
Johan Herl
a
nd
Add testcase
f
or 'git cvsex
p
ortcommi
t
-w
$cv
s
dir
.
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-02-13
Johan He
r
land
Fix 'git cvse
x
po
r
tcommit -w $cvsdir
.
.
.
' when used
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-02-13
Johan H
e
rland
Add testca
s
e
f
or 'g
i
t cvsexp
o
rtcommit
-w $cvsdir
.
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2007-10-03
Johan Herland
Mention 'cpio
'
depend
e
nc
y
in
I
NS
T
A
L
L
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2007-06-09
Johan H
e
rland
Remove unnecessary co
d
e and com
m
ents on non-existing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next