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
ohan
Herland
g
it not
e
s merge: Handle real, non-
c
onflicting note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin/note
s
.
c
:
Refact
o
r c
r
eation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merge: Initial
imp
l
ementation handling trivia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
a
n
d
builtin/notes
.
c: Split not
e
s ref
DWIM
m
ery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rlan
d
notes
.
c
:
Us
e
two newlines (instea
d
of one) wh
e
n concatenati
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
(tri
v
i
a
l) t3303: Indent w
i
th tabs instead o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
H
e
rland
no
t
es
.
h/c
:
Propagate combine_notes_fn return va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
erland
notes
.
h
/c: Allow combine_notes
functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an Herland
notes
.
c
:
Reorde
r
functions in prep
a
ration for nex
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
no
t
es
.
h: Make
d
efault_no
t
es
_
ref() available in
n
otes
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
(triv
i
al) note
s
.
h: Minor documentation fixes t
o
cop
y
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
no
t
e
s
.
c: Hexi
f
y SHA
1
in
die() message from in
i
t_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
r
evision: Turn o
f
f
h
is
t
ory simpl
i
fi
c
ation
i
n --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: F
i
x
typo in
-
-ance
s
try-path e
r
ror
m
essage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n H
e
r
l
a
nd
Docum
e
n
tation/rev-
l
i
s
t
-o
p
tions
.
txt:
E
xplain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herlan
d
Documentation
/
rev-li
s
t-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herlan
d
dif
f
.
c:
Ensu
r
e "in
d
ex $from
.
.
$to" line
contains unam
b
i
g
uous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herl
a
nd
b
u
iltin-notes: Minor (mostly parse_options-r
e
lat
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
ohan Herland
submodule
summary: Don't barf wh
e
n invoked in
an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
ti
n
-notes: Add
"copy" subcomman
d
for copy
i
ng not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
l
tin-no
t
es: Misc
.
ref
a
c
tor
i
ng of ar
g
c and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
built
i
n-n
o
tes: A
d
d -c/-C options for
reusing
n
ot
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
buil
t
in-notes: Refac
t
or
h
a
ndling of -F opt
i
on to all
o
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
b
u
i
l
tin-notes: D
e
p
recate the
-m/-F option
s
for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-note
s
: Ad
d
"a
p
pen
d
" subcom
m
and for appe
n
din
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: Add
"add" subcommand for add
i
n
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin
-
notes:
A
d
d --mes
s
age/--file ali
a
se
s
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes: Add "list" s
u
bcomm
a
nd for li
s
ting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Doc
u
ment
a
tion: Generalize git
-
notes docs
t
o 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
b
u
iltin-notes:
A
d
d "
p
rune
"
subcomman
d
for rem
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: prun
e
_n
o
tes(): Pr
u
ne notes that belon
g
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
t330
5
: Verify
that removing not
e
s trigg
e
rs a
u
to
m
atic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
builtin-notes:
Add
"remo
v
e"
subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach built
i
n-note
s
to remove
emp
t
y notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
He
r
land
Te
a
ch notes cod
e
to properly preserve
non
-
notes i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305: Verify that ad
d
ing many notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301:
Verify suc
c
essful anno
t
at
i
on of non-c
o
m
m
its
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
B
uiltin-i
f
y g
i
t-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
Refactor notes
concatenatio
n
int
o
a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
Note
s
API:
A
llow m
u
lt
i
ple
c
o
ncurr
e
nt
notes
tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Not
e
s API: write_notes_t
r
ee(): Store
the no
t
es tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herla
n
d
Notes API: for_
e
ach_not
e
():
T
rave
r
s
e the en
t
ir
e
no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
t
e
s
API
:
g
e
t_no
t
e(): Return the note annotating
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
Notes
AP
I
: remov
e
_note(): Remove
n
ote object
s
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Note
s
API: add_
n
ote(): Add note obje
c
ts to the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
Notes API:
i
n
i
t_notes(): Initialize the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
Add test
s
for checking co
r
rect h
a
ndling of $GIT_N
O
T
E
S
_R
E
F
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
Notes API: get_commit
_
notes() -> format_note()
+
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
Minor
c
osmetic f
i
xes
t
o notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an Her
l
and
bu
i
ltin
-
confi
g
:
Fix cr
a
sh
w
hen using "-f <
r
el
a
t
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add mo
r
e tes
t
cases
to tes
t
fa
s
t-imp
o
r
t
of no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an
Herland
R
ename t9301 t
o
t9350, to make room for mo
r
e fast-imp
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
e
r
land
fast-im
p
ort: P
r
oper
n
o
tes
tree manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix
c
rasher
o
n
e
n
countering SH
A
1-like non-note
i
n notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
a
n He
r
l
a
nd
B
a
sic
b
uild i
n
frastructure
for Pyt
h
o
n
scr
i
p
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
dd
se
l
ftests veri
f
ying conc
a
tenation of m
u
ltiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
l
a
nd
Refactor notes code to con
c
a
t
enate mult
i
ple notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add selftests veri
f
ying that
w
e can parse no
t
es trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Teach
t
h
e
n
o
te
s
lookup cod
e
t
o parse notes trees
w
ith
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
T
each no
t
es code to
f
r
e
e
its internal data str
u
ctures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
a
n
Herla
n
d
Add
flags to get_commit_notes
(
) to control
t
h
e
format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
la
n
d
t330
2
-notes-ind
e
x-e
x
pens
i
ve:
S
peed
u
p create_
r
e
p
o()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rlan
d
f
a
st-import: Add support for importing
c
o
m
mit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
a
n
He
r
land
Teach "-m <
m
sg>" a
n
d "-F <file>" to "git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan
H
erland
gi
t
cl
o
ne
:
Add --recursive to autom
a
tic
a
lly checkout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t7407: U
s
e 'rev-pa
r
se --shor
t
' rather than bash's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan Herland
git
s
u
b
m
o
dule
status: Add --recursive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herland
g
i
t submodu
l
e update: Introd
u
c
e
--recu
r
si
v
e to
u
pdate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herla
n
d
g
i
t
s
ubm
o
dule foreach:
A
dd --
r
ec
u
rsive to recurs
e
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herland
git submodule foreach
:
t
est a
c
cess to submodule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
oh
a
n Herland
A
dd selftest for
'
git submodu
l
e
f
o
r
each'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rlan
d
git
s
ubmodule:
C
l
eanup
u
sage string and add option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herla
n
d
git su
b
mo
d
ule for
e
ach: P
r
ovid
e
acc
e
ss to submodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Joha
n
Herlan
d
help
.
c: give correct struc
t
ure's s
i
ze to m
e
mset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan
Herland
quickfetch():
P
re
v
ent ove
r
flo
w
of the
r
ev-lis
t
command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Joh
a
n Herlan
d
git-s
u
bmodule: a
d
d support fo
r
--merg
e
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Rename submodule
.
<name>
.
rebase to submodule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
J
oha
n
H
erla
n
d
U
pdate docs o
n
behaviour of 'core
.
s
haredRepository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan H
e
r
l
an
d
M
ov
e
chmod
(
f
oo, 0444) in
t
o move_temp_
t
o_fi
l
e()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herl
a
nd
Use strch
r
nul() ins
t
ead of strchr(
)
plus m
a
nual w
o
rk
a
r
o
und
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Jo
h
an Herland
Fix
s
ubmodule syn
c
with
relative
s
ubm
o
dule U
R
Ls
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan H
e
rland
f
or-each-ref: Fix --format=%(
s
ubject) for log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan H
e
rl
a
nd
Fix As
c
iiDoc
errors in merge do
c
u
m
e
ntation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
J
o
h
a
n H
e
rla
n
d
Brin
g
local clone's ori
g
in URL in line with that
o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herla
n
d
T
each "git diff -p" HTML fu
n
cname pa
t
terns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Teach "git clo
n
e" to pack refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
P
r
epa
r
e
t
e
s
tsuit
e
for a
"git clone" that
p
acks refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Jo
h
an Herl
a
nd
M
ove pack_refs()
and
f
riends into libgit
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
I
n
c
or
p
orate fetched pa
c
ks in futur
e
object trav
e
rsal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
J
o
h
a
n
Herlan
d
T
h
e
"
curl" execu
t
a
ble is no longer
required
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
J
oh
a
n Herland
C
o
nsistency
:
Use
"libcurl" ins
t
ead of "cUR
L
librar
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan H
e
rla
n
d
cp
i
o
is no longer
use
d
b
y git-clone
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan Herland
Add tes
t
for
cloning wit
h
"--reference" repo
b
eing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Joh
a
n Herland
Add a t
e
st for another combination of
-
-reference
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Johan Herl
a
nd
Fi
x
'
git cvsexpo
r
tcommit -w $cvsdir
.
.
.
' w
h
en used
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Johan Herla
n
d
Add te
s
tcase
f
or 'git cvsexpo
r
t
c
ommit -w
$cvsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
J
ohan Herland
F
i
x 'git
c
vsexport
c
ommit
-w $cv
s
dir
.
.
.
' whe
n
used
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
Johan Herland
Add testca
s
e for 'git cvsexp
o
rtcom
m
i
t -w
$cvsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2007-10-03
J
o
han Herland
M
e
n
t
ion 'cpio'
d
e
p
e
n
de
n
cy in INSTA
L
L
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2007-06-09
J
o
han Herland
Remove unnecessa
r
y code and comments on
n
on-existing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next