repo.or.cz
/
git
/
git-svn.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: Manual conflict resolution, part 2/2
2010-11-17
Johan Her
l
and
g
i
t n
o
t
e
s
merge
:
Manua
l
c
onfli
c
t resolution, p
a
rt 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
M
anual conflict resolut
i
on, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Docu
m
entation: Preliminar
y
d
ocs on 'git n
o
tes m
e
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes m
e
rge: Add
automatic conflict
r
e
solver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
er
l
and
g
i
t notes merge: H
a
ndle real,
n
on-conf
l
icting
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
builtin/not
e
s
.
c: Refactor crea
t
i
o
n
of notes co
m
mits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herlan
d
git no
t
es mer
g
e: Initial implement
a
t
i
o
n handling
t
rivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
builtin
/
note
s
.
c
:
S
plit notes ref DWIMmery
i
nto a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
notes
.
c: U
s
e two ne
w
l
i
ne
s
(i
n
stead of on
e
) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
land
(trivial) t3303:
I
ndent with tabs i
n
stead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
nd
notes
.
h/c: P
r
o
paga
t
e combine_n
o
tes_fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
h/c: Allo
w
combine_notes functions to remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c: R
e
o
r
der functions i
n
prepa
r
ation
for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an
H
erland
n
o
t
es
.
h: Mak
e
d
efa
u
lt_no
t
es_ref(
)
available in
n
o
t
es API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan H
e
r
land
(trivia
l
) notes
.
h: Minor
d
o
cument
a
t
i
o
n
fixes
t
o copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
notes
.
c
: Hexi
f
y SHA1 in
d
i
e
() message from
i
nit_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herl
a
nd
revision:
Turn off history
si
m
plifica
t
ion
in
--ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
on: Fix typo in -
-
ancestry-pa
t
h erro
r
message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
Doc
u
mentati
o
n/rev-list-optio
n
s
.
txt
:
Expla
i
n --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
D
o
cume
n
tation/rev-list-options
.
t
x
t
: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
h
an Herland
diff
.
c: En
s
ure "in
d
ex $from
.
.
$to" l
i
ne cont
a
i
n
s
unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herlan
d
builtin-note
s
: Minor (m
o
s
tly parse_options-r
e
l
ate
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submo
d
u
l
e su
m
mary: D
o
n't barf when invo
k
ed
in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rl
a
nd
b
u
ilti
n
-note
s
:
A
dd "c
o
py"
subcommand
f
o
r
cop
y
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
H
erland
builtin-notes: Misc
.
re
f
actor
i
n
g
o
f
argc and
e
xit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes
:
A
d
d -c/
-
C options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
il
t
in-not
e
s: Refac
t
or hand
l
ing of -F opt
i
on to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
buil
t
in-notes: Deprecat
e
the -m/-F
o
ptions
for "
g
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
builtin-notes: Add "append" subcomm
a
n
d
for
a
ppending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rla
n
d
bu
i
ltin
-
n
otes: Ad
d
"add"
s
ubcom
m
and for
a
d
d
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
built
i
n-notes:
A
dd --m
e
s
sage/--file aliases
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-note
s
:
Add "list" subcommand for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
Documentation: Generaliz
e
gi
t
-notes docs to '
o
bjects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
bui
l
t
i
n-notes: Add "prune" sub
c
ommand for rem
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
: prune_
n
o
tes(): Prune notes th
a
t be
l
ong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t33
0
5: Verify that removing note
s
triggers automati
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
b
uiltin-no
t
e
s
:
Add "rem
o
ve"
s
ubcomman
d
for
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
Teach builtin-notes
t
o r
e
move empty
n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Teach n
o
te
s
co
d
e to p
r
operly p
r
eserve non-
n
otes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify that adding
many n
o
tes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify suc
c
es
s
f
ul
anno
t
ation of
n
on-com
m
i
ts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Builtin-ify git-n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
H
e
r
land
Refactor notes concatenation into a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
Notes API:
A
llow
m
ultipl
e
co
n
current notes tr
e
es w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: wri
t
e_notes_tree(
)
: Stor
e
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Not
e
s API: for_each_note():
T
r
a
verse the entir
e
n
o
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API:
g
e
t
_note(): Ret
u
rn the not
e
a
nnotati
n
g
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rla
n
d
Notes API: remove_note(): R
e
move
note obj
e
cts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
Notes API: a
d
d_
n
ote(): Add note obje
c
ts to t
h
e i
n
te
r
nal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
No
t
es API: init_notes(): Initi
a
lize
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Add tests for checking c
o
rrect handling of
$GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API:
g
et
_
c
o
mmit_no
t
es() -> format_
n
ote() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Minor cosmetic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herlan
d
builtin-config: Fix crash when using "-f <r
e
lative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
rla
n
d
Add mo
r
e
testcases to
t
est fast-impor
t
of
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
R
ename t9301 to
t9350, t
o
make
room f
o
r
m
ore
f
a
st-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herland
fast-imp
o
rt: Pr
o
per
no
t
e
s tre
e
manipulat
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
F
i
x
c
rasher on encoun
t
ering
S
H
A1-like
n
on-note
i
n notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic build infr
a
str
u
c
t
ure for Py
t
hon scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Her
l
an
d
A
dd sel
f
tests
ver
i
fying con
c
atena
t
i
on of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
R
e
f
a
ctor no
t
e
s
cod
e
to conca
t
e
nat
e
multiple notes ann
o
tating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add selftests verifying that
w
e can parse
notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Teach
t
h
e notes
l
ookup cod
e
to parse not
e
s trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
Teach notes code to free
its in
t
ernal data
s
tructures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an
H
e
rland
Ad
d
flags to get_commi
t
_notes(
)
to c
o
ntrol the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t
3302-notes-
i
ndex-e
x
pensive: Speed up create_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an
H
e
rland
fast-import: Add
su
p
po
r
t for
i
mpo
r
ting commit n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Her
l
and
Teac
h
"-m <msg>" a
n
d "-F <fil
e
>" to "git
n
o
tes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clone: Add --recursive to automatically checkout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
ohan
H
erlan
d
t
740
7
: Use 'rev-parse --shor
t
' rather than b
a
s
h
's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan
Herla
n
d
git
sub
m
o
d
u
le sta
t
us
:
Add --recu
r
sive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n
H
e
rland
git
s
ubmodu
l
e up
d
ate: Introduc
e
--rec
u
rs
i
ve to updat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan Herland
git s
u
bmod
u
le f
o
reach: A
d
d --recur
s
i
ve
t
o rec
u
rse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
and
gi
t
sub
m
o
d
ule
fore
a
ch:
test
a
c
cess to submodu
l
e name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
e
r
land
Add self
t
e
s
t for
'git sub
m
odul
e
foreach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an He
r
land
git s
u
b
module: C
l
eanup usage s
t
r
i
ng and add opt
i
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herl
a
nd
git
s
ubmodule foreach: Pr
o
vide
a
cces
s
to
s
ubmodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan
Herland
help
.
c: give correct structure's size to
m
emset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan H
e
rland
q
uickf
e
tch(): P
r
event ove
r
flow of the rev-list command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
git-s
u
bmodule: add su
p
port for
--m
e
rge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Rename subm
o
dul
e
.
<name>
.
rebas
e
to
s
ubmodule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan
Herland
Update d
o
cs
on behaviour of '
c
o
r
e
.
s
h
aredRepository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
J
o
h
an Herland
Move
chmod(foo
,
0
4
44
)
into move_temp
_
to_
f
ile
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herlan
d
U
se s
t
rchrnul() in
s
tead of
s
tr
c
hr() plus manua
l
wo
r
karound
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Jo
h
an Herland
Fix submodule sync with r
e
lative submodule U
R
Ls
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
for
-
each-r
e
f: Fix --format
=
%(subject
)
fo
r
log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Joha
n
Herl
a
nd
Fix AsciiDoc errors
in
merge documenta
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
J
o
han Herla
n
d
Bring l
o
cal cl
o
n
e'
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 Herland
Teac
h
"gi
t
dif
f
-p" HTML funcn
a
me patterns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
J
o
han Herland
Teac
h
"git clone"
to pack refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan
H
e
rland
Prepare
testsuite
for a
"git c
l
one
"
that
p
acks refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
J
o
han Herlan
d
Move
p
ack_refs(
)
and friends into
l
ibgit
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan
Herland
Incorpo
r
ate
fetched packs in fu
t
ure object t
r
a
v
e
r
sal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan
H
erland
T
h
e "curl"
e
xecutable is no longer
r
equired
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Her
l
and
Consistency: Use
"libcurl" in
s
tead of "cURL libr
a
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herlan
d
c
pio
is no longer used by git-clone
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Joha
n
Herland
Add test f
o
r c
l
on
i
n
g
with "--
r
eference" repo being
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan H
e
rland
Ad
d
a test for
a
n
o
th
e
r
combination of --ref
e
rence
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Johan Herl
a
nd
Fix 'git cv
s
exportcommit -w $cvsdir
.
.
.
' when used
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Joha
n
H
e
rl
a
nd
Add testc
a
se fo
r
'git cvsex
p
ortcommit -w $cvsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next