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: --commit should fail if underlying notes ref has moved
2010-11-17
Joha
n
He
r
land
git
notes merge:
-
-
c
o
m
mi
t
should fail
i
f u
n
de
r
l
y
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List conflicting notes in notes
m
erge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
gi
t
n
otes merge: M
a
nu
a
l conflict r
e
so
l
ution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s merge:
M
anual con
f
lict resolutio
n
, part
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Do
c
u
m
e
n
t
a
t
ion: Pre
l
im
i
nary do
c
s on 'git notes mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
g
i
t
notes
merge: Add
automa
t
ic conflict resolver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merge: Han
d
le
r
eal, non-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
b
uiltin/no
t
es
.
c: Ref
a
c
tor cre
a
tion of note
s
commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
g
it notes merge: Initial impleme
n
tatio
n
handl
i
ng trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
builtin/n
o
tes
.
c
:
Spl
i
t notes ref DWI
M
mery into
a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
not
e
s
.
c: Use t
w
o n
e
w
lines
(
i
nstead of
o
ne) when concaten
a
tin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(tri
v
ial)
t
33
0
3: Ind
e
nt with ta
b
s instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
note
s
.
h/c: Propaga
t
e combine
_
notes_fn return val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herl
a
n
d
notes
.
h/c: Allow co
m
bine_
n
otes funct
i
ons to
r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
c: Reo
r
der f
u
nctions in
p
reparation for ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
h: Make default_
n
otes_
r
ef(
)
availa
b
le in notes
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
t
rivial
)
n
o
t
e
s
.
h:
M
inor doc
u
mentation fix
e
s to
c
o
py_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
n
o
tes
.
c: Hexify SHA1
i
n die() messag
e
f
r
om ini
t
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
re
v
ision: Turn off histor
y
simp
l
i
f
ication in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
rev
i
sion: Fix typo
in --ancestry-pa
t
h error mess
a
ge
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docume
n
ta
t
i
o
n/rev-
l
i
st-options
.
txt: Expla
i
n --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
umenta
t
ion/rev-lis
t
-options
.
txt: Fix mi
s
sing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
han Herland
diff
.
c: Ensure "i
n
dex $
f
rom
.
.
$
to" line contains unambiguo
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-n
o
tes: Minor (mostly par
s
e_options-re
l
ated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan H
e
rland
subm
o
dule s
u
mmary: Don't barf when invoked in
an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s: Add "co
p
y
" subcomm
a
nd for c
o
pying note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin
-
no
t
e
s
: M
i
sc
.
r
efactoring of
ar
g
c
and exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
bu
i
ltin-notes: Add -
c
/-C
options for
reusing no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
n
d
built
i
n-notes:
Refactor handling
o
f -F optio
n
to
a
llo
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builti
n
-notes: De
p
recate 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" subcommand for appen
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes: Add "add" subcommand for adding
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
a
n
d
builtin-notes: A
d
d --mess
a
ge/--file aliases
f
or -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-not
e
s:
A
d
d
"list
"
subcommand for
l
isting n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
n
d
D
oc
u
mentatio
n
: Ge
n
eralize g
i
t-notes docs to 'obje
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
buil
t
in-not
e
s: Add
"
prune" s
u
bco
m
mand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API: pr
u
ne_n
o
t
es()
:
Pru
n
e notes that
belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herla
n
d
t3305: Verify that
r
em
o
vin
g
notes trigg
e
rs a
u
t
o
matic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
builtin-notes: Add "remove" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
Teach builtin-notes to remo
v
e empty no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Teach notes code to
properly preserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
05: Verify that ad
d
ing
m
a
n
y no
t
es
with git-no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
t
3
301: Verify successful annotation
o
f no
n
-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
Builtin-ify
g
i
t
-
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
e
rland
R
e
facto
r
n
otes concatena
t
i
on into a flexi
b
le
interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
Notes API:
A
llow multiple concur
r
ent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herla
n
d
Notes
API: write_notes_tre
e
(
)
:
S
to
r
e the
notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
He
r
la
n
d
No
t
es API: for_each_note():
Tra
v
e
rse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API
:
get_note(): Ret
u
rn the
note annot
a
ting the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Not
e
s API: remo
v
e_note(): Remove note objec
t
s from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: add_note(): Add note object
s
to the i
n
ternal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
er
l
and
Notes API
:
init_notes():
I
nitialize the n
o
t
e
s
t
r
ee
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
and
Ad
d
tests for checking correct ha
n
dling
of $GIT_N
O
T
E
S_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
N
otes API: g
e
t_
c
ommit_note
s
() -> format_note(
)
+ remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
Mino
r
cosme
t
ic fi
x
es to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan
H
erl
a
nd
b
u
iltin-conf
i
g: F
i
x
c
rash when using "-f <relat
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add mor
e
testca
s
e
s to test fast-impor
t
of
not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herland
Re
n
ame t9301 t
o
t9350, to
mak
e
room for more fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
Herland
f
a
st-import: Prop
e
r not
e
s tree ma
n
ipulati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
o
han Herland
Fix
crasher on encountering SHA1-lik
e
non-n
o
t
e
in not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan He
r
land
Basic
build infrastru
c
ture
fo
r
Python s
c
rip
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Ad
d
se
l
ftests v
e
rifying concatenation of
multip
l
e notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Refactor
n
otes
code
t
o conc
a
tenate multiple notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d sel
f
t
ests ver
i
fyin
g
t
h
at
we can parse note
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Tea
c
h the not
e
s lo
o
kup code to p
a
rse not
e
s trees
w
ith
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
a
n
Herland
Teach not
e
s code to fr
e
e
its interna
l
data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add fl
a
gs to get_commit_notes() to con
t
r
o
l
t
he form
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302-notes
-
ind
e
x-expensive: Speed u
p
create_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
f
a
s
t-import: Add
sup
p
ort
f
or importing c
o
m
m
it
note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han
He
r
la
n
d
Teach "
-
m <msg>" and
"
-F
<
f
ile>" to "git notes edi
t
"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
o
han He
r
land
git clone: Add --rec
u
rs
i
v
e
to a
u
to
m
atical
l
y ch
e
cko
u
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Joha
n
Herland
t7407: Use 'r
e
v
-
parse --short' rath
e
r than bash's sub
s
tring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git
sub
m
odule
s
tatus: Add --recursive to
recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
and
g
it s
u
bmodul
e
update: Int
r
oduce --re
c
ursiv
e
t
o
u
p
d
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herl
a
nd
git submodule foreach
:
Add --recu
r
sive to rec
u
rse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an
H
e
rland
git sub
m
odu
l
e
f
oreac
h
:
test acces
s
to s
u
bmodule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
a
n Herland
Add self
t
est fo
r
'git submodule foreach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han H
e
rland
git submodule: Cleanup usage st
r
ing and add op
t
ion
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herla
n
d
git su
b
module fo
r
each: Provide access
t
o
s
ub
m
od
u
le
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
J
oh
a
n Her
l
and
help
.
c: give correct str
u
cture's size to memset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herl
a
n
d
quic
k
fetc
h
(): Prevent overflow of
the rev-list
command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
h
a
n
Herland
gi
t
-submodule: add support for --merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Rena
m
e sub
m
odule
.
<name>
.
rebase to
submodu
l
e
.
<na
m
e>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Joh
a
n Herland
Update
d
o
c
s on behaviour
of 'core
.
sharedRepos
i
tory
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
M
ove chmod(foo, 0444)
into move_temp_to_file(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Jo
h
an He
r
land
Use str
c
hrnul() instead
o
f str
c
hr
(
) plus m
a
nual
w
o
rkaround
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Joh
a
n Herl
a
nd
Fix s
u
b
m
odule sync w
i
th r
e
lativ
e
submodule URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
fo
r
-each-ref:
F
ix
-
-format=
%
(
s
ubject) for
l
o
g
mess
a
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan Her
l
and
Fi
x
A
s
ci
i
Doc errors in merge
d
ocumentation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Jo
h
an Herland
Br
i
ng
local clo
n
e's origin U
R
L in line w
i
th
that of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Joha
n
He
r
l
a
nd
Teach "git dif
f
-p" HTML funcname
patterns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Joha
n
H
e
r
land
Teach
"git clon
e
" to pack refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan H
e
rland
Prepare testsuit
e
f
or a "
g
it clone" that pa
c
ks refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Move
pack_refs() and friends into libg
i
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
J
oha
n
Herland
Incorpor
a
te fetched pa
c
ks i
n
f
u
ture
object traversal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan He
r
land
Th
e
"
c
u
rl" executable is
n
o
long
e
r requi
r
ed
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan H
e
rland
Consistency
:
Use "li
b
curl" i
n
stea
d
of
"cUR
L
library
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
J
o
han Her
l
a
n
d
cpi
o
is no l
o
ng
e
r
used by
git-clone
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
J
o
han Herland
A
dd t
e
s
t
fo
r
cloning
with
"--reference
"
r
epo being
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan Herla
n
d
Add
a test for a
n
other c
o
mbin
a
tion
o
f --refe
r
e
nc
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next