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: Manual conflict resolution, part 1/2
2010-11-17
Johan Herland
git note
s
merge:
Manu
a
l
confli
c
t r
e
so
l
u
t
ion, p
a
rt
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Documentation:
Prel
i
minary docs on 'gi
t
notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git
not
e
s me
r
ge: Add automatic
c
onf
l
i
c
t resolver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
nd
git not
e
s
m
erge:
H
andle rea
l
, non-co
n
flicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
builtin/notes
.
c: Refac
t
or creation of no
t
es commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
it no
t
es mer
g
e: Initial im
p
lementation hand
l
ing trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
b
ui
l
tin/no
t
es
.
c: Spli
t
n
o
t
es
ref DWIMmery
i
nto a se
p
ara
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
notes
.
c: Use two new
l
in
e
s (inst
e
a
d
of one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
(triv
i
al
)
t
3
303: Indent with t
a
bs i
n
stead
of s
p
aces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h
/c
:
Propag
a
te
c
ombine_n
o
te
s
_fn retur
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
h/c: A
l
low combine_n
o
tes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
r
land
no
t
es
.
c: Reorder functio
n
s in p
r
eparation for
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herl
a
nd
notes
.
h
: Make defaul
t
_n
o
te
s
_ref(
)
available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
He
r
land
(t
r
ivial
)
notes
.
h: M
i
nor d
o
cu
m
e
nt
a
tion fixe
s
to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
c: Hexif
y
SHA
1
in die() message from init_note
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
revision: T
u
rn off
his
t
ory simplification
i
n -
-
an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
revisi
o
n: Fi
x
t
y
p
o
in --ance
s
t
ry-path er
r
or messag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
Doc
u
m
e
ntation/rev
-
list-o
p
tions
.
txt: Explain
--ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
Documen
t
a
t
ion/rev-li
s
t-o
p
tions
.
txt: Fix mis
s
ing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c
: Ensure
"index
$
fro
m
.
.
$to" li
n
e
co
n
ta
i
ns unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Her
l
and
bu
i
lt
i
n-n
o
tes: Minor
(
mo
s
t
l
y par
s
e_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
s
u
b
module summ
a
r
y: D
o
n
'
t bar
f
w
hen invoked
i
n
an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
l
a
nd
builtin-no
t
es:
A
dd "cop
y
" subcommand for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
builtin-notes: Misc
.
re
f
a
c
to
r
i
ng
o
f
argc and exit v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
b
u
ilt
i
n-n
o
tes: Add -
c
/-C opt
i
ons for reus
i
ng notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builti
n
-
notes
:
R
e
f
a
ct
o
r handling of
-
F
option
t
o
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Depr
e
cate the -m/-F
o
pti
o
ns
for
"
g
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes: Add "appe
n
d" subcommand
for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
e
r
l
and
builtin
-
n
o
t
e
s
:
A
dd "add" subcommand for add
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add -
-
m
essage/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
lan
d
buil
t
in-no
t
es:
Ad
d
"
l
ist" subcomman
d
for listi
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Documentation
:
Generalize g
i
t-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
b
u
i
l
tin-notes: Add "prune" subcommand
for remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
Notes API: prune_n
o
tes(): Prun
e
notes
t
hat belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
t33
0
5
:
Verify that removing notes triggers auto
m
atic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-
n
otes: Add
"
remove" subcommand f
o
r
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Teach
b
uil
t
in-notes
to remo
v
e empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Teach notes
code to
prope
r
ly pr
e
serve non-note
s
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
t
3305: Verify tha
t
ad
d
i
n
g many
notes with g
i
t-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3
3
01: Verify success
f
ul
annotation of n
o
n-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
B
u
iltin-ify gi
t
-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Refactor notes concatenation into a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
Notes AP
I
: A
l
low multiple
c
oncur
r
ent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes A
P
I
:
w
rite_note
s
_t
r
ee(): Store the notes
t
r
ee
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
No
t
e
s
A
P
I
:
f
o
r_ea
c
h_
n
o
t
e(): Traverse the
e
n
t
ire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API:
get_not
e
(): Return th
e
note an
n
ota
t
i
ng the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
Notes AP
I
: re
m
ove_not
e
():
R
emove n
o
te ob
j
e
cts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
t
es API:
add_not
e
(
)
: Add note
o
bjects t
o
the inter
n
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes
A
PI:
i
n
it_no
t
es(): Initialize the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
A
d
d tests f
o
r checking correc
t
h
andl
i
n
g of $G
I
T_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
H
erl
a
nd
Notes
A
PI: ge
t
_com
m
i
t
_notes(
)
->
f
orma
t
_note
(
) +
r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmet
i
c
fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin
-
c
o
nfig: Fix crash when
using "
-
f
<
r
e
l
a
t
ive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herland
Ad
d
more tes
t
cases to test fast-import o
f
no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an H
e
rland
Renam
e
t
9
30
1
to t93
5
0, t
o
make room for more fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
fast-import:
P
roper notes tree manip
u
la
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan
H
e
rland
Fix
c
rasher on
enc
o
unt
e
ring SHA
1
-like
non-note in not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Her
l
and
Bas
i
c build
i
nfra
s
tructure for Python scrip
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
A
d
d selftests ve
r
ifying concatenation of multi
p
le
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
Refac
t
or notes code to concat
e
nate multiple note
s
anno
t
at
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add selftests verifying th
a
t we ca
n
p
a
r
se not
e
s trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Teach the notes loo
k
up
code to pa
r
se
notes trees
w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han
H
erland
Teach notes code to free it
s
internal
data stru
c
tures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herl
a
nd
Ad
d
f
lags to ge
t
_com
m
it_notes() to c
o
ntrol the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3
3
02-
n
o
tes-index-e
x
pensive: Speed
up
create_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
fast-imp
o
r
t
:
A
dd support
for impo
r
ti
n
g
c
ommit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach "-m <ms
g
>" and
"
-F <fi
l
e>" to "git notes
e
dit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
g
it
c
lone
:
Add -
-
recur
s
ive to automatical
l
y
c
heckout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Her
l
and
t7407: U
s
e 'rev
-
parse --short' rather than b
a
s
h
's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan Herl
a
nd
git
s
ubmodule statu
s
: Add --
r
ecursive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan Herland
git
s
ubmodu
l
e
updat
e
: Int
r
oduce --recursive to update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git submodule foreach: Add --
r
ecursive t
o
r
ecurse i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herlan
d
gi
t
subm
o
dule foreac
h
: test access to
submodu
l
e name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rla
n
d
Add selftest for 'git submod
u
le foreach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git su
b
mo
d
u
le:
C
leanup
usage str
i
ng and
add option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Joh
a
n Herland
git submodule fore
a
ch: Provi
d
e access to su
b
module
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan
H
erla
n
d
hel
p
.
c
:
gi
v
e correc
t
s
tructure's size
t
o me
m
set(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quickfe
t
c
h(): Pre
v
ent o
v
erf
l
ow of the rev-list co
m
mand
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Joh
a
n Herland
git-s
u
bmodule
:
ad
d
s
u
p
p
ort
for --mer
g
e
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
han Herland
R
enam
e
subm
o
dule
.
<name>
.
reb
a
se to submodu
l
e
.
<
name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
J
o
ha
n
H
e
rland
Up
d
a
t
e docs on behavi
o
ur of 'core
.
share
d
Reposit
o
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
J
o
han Herland
Move chmod(foo, 0444) into move_tem
p
_to_fi
l
e()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herland
U
se
s
trchrnul()
i
ns
t
ead of st
r
chr() p
l
us
manual
w
orkaroun
d
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Her
l
and
Fix submo
d
ule sync wit
h
r
e
l
ative submodu
l
e URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
J
o
han Herlan
d
for-each-re
f
: Fix --format
=
%(subje
c
t
)
for
log me
s
s
age
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan He
r
land
Fix AsciiDoc errors i
n
merge doc
u
ment
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Johan Herland
Br
i
ng
local clone's origin
UR
L
in lin
e
with tha
t
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Joha
n
Herland
Te
a
ch "git diff -p" HTML funcname pa
t
ter
n
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herla
n
d
Te
a
c
h
"
git clone" to pac
k
refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herl
a
nd
Prep
a
r
e
testsuite fo
r
a "git clo
n
e"
t
hat packs re
f
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Move
p
a
ck_refs() and friends into libgit
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
I
n
corpora
t
e fetched pac
k
s in f
u
ture object traversal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Joh
a
n Her
l
and
T
h
e
"cu
r
l"
exe
c
utable is no l
o
nger
re
q
uired
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan
H
erl
a
nd
Cons
i
s
tency: Us
e
"libcurl" instead
o
f "cURL
l
i
brary
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herlan
d
cpi
o
is no longer
u
sed by git-clone
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan Herland
Add test f
o
r cloning with "--ref
e
rence" re
p
o b
e
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan H
e
r
l
and
Add
a t
e
st f
o
r
another combination of
-
-refe
r
en
c
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Joh
a
n He
r
land
Fix 'git cvsexp
o
r
tcomm
i
t -w $cvsdir
.
.
.
' when used
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Johan Herland
Ad
d
testcase
f
or 'gi
t
c
v
sexportcommit -w $cvs
d
ir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
Johan Herl
a
nd
F
i
x '
g
it c
v
s
e
xportcom
m
it -w $cvsdir
.
.
.
' when
u
se
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next