repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: Preliminary docs on 'git notes merge'
2010-11-17
Johan Herland
Documen
t
ation: Preliminary docs
o
n 'git
n
otes m
e
rge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
He
r
la
n
d
git
n
otes merge: Ad
d
a
utomatic conflict resol
v
ers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erla
n
d
gi
t
no
t
e
s m
e
rge: Handle real, non-confl
i
cting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Refact
o
r cr
e
atio
n
o
f
notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge
:
Init
i
a
l implementation handlin
g
t
rivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erlan
d
builtin/n
o
t
e
s
.
c: Split
n
otes
r
ef DWIMmery
i
n
to
a
separa
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use
t
wo newl
i
nes (instea
d
of one) when co
n
c
a
tenat
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(
trivi
a
l) t3303:
I
n
d
ent
with tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Propag
a
t
e
comb
i
ne_no
t
es_fn
return valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Her
l
and
n
ote
s
.
h/c: Allow
combine_notes
f
u
nction
s
to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
c: Reorder functio
n
s in preparat
i
on for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make default_notes_
r
ef() available
in notes A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan He
r
l
a
n
d
(trivial) notes
.
h: Mi
n
or documentation fi
x
es to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Her
l
an
d
notes
.
c: Hexify SHA1
in die() message fro
m
init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
evision:
Turn off history simplif
i
c
ation in --ance
s
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix typ
o
in --ancestry-path
error
m
e
ssage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
Documentation/rev-l
i
st-opti
o
n
s
.
txt: E
x
pl
a
in --a
n
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
umentation/rev-list-options
.
t
xt: Fix mis
s
ing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
an Herland
d
i
ff
.
c
:
Ensure "inde
x
$fro
m
.
.
$to" line contains
u
nambigu
o
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an
H
erland
builti
n
-not
e
s
: Minor
(
mos
t
ly pa
r
se_
o
pti
o
ns-rel
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an
Herland
submodu
l
e
s
ummary: Don't
barf
w
h
e
n in
v
oked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: A
d
d "copy
"
subcom
m
and for
c
o
pying not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
b
u
iltin
-
note
s
: Misc
.
refactoring of
a
r
gc an
d
exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
u
i
l
t
in-n
o
tes: Add
-
c/-C options
for reus
i
ng no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
builtin-notes: Refactor handling of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
builtin-notes:
D
e
p
re
c
ate the -m/-F
o
ptio
n
s for "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es
:
Add "append" subc
o
m
mand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes: Add
"
add" subcommand
f
or adding no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes: Add --messag
e
/--f
i
le aliases fo
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Add "list" subcommand for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Do
c
u
m
e
n
t
ati
o
n: Generalize
git-no
t
es docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-n
o
te
s
:
Add "
p
ru
n
e
"
s
ubcomman
d
for rem
o
vin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
Notes API: prune_notes(
)
: Prune notes that be
l
o
ng to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3305:
V
erify that remo
v
ing
n
ot
e
s t
r
iggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
buil
t
i
n-notes:
A
dd "
r
emove" subco
m
mand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Teach
bu
i
ltin-not
e
s to
r
emov
e
e
mpty not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Teach notes code t
o
proper
l
y preserve non
-
notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
t3
3
05:
Verify that
adding many notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify successful
a
n
not
a
ti
o
n of n
o
n-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Builti
n
-ify git-
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
R
efac
t
or notes c
o
ncatenation into a flexible inter
f
ace
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
l
a
nd
Notes A
P
I:
A
l
low multiple concurrent
notes trees
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: write_notes_tree
(
): Store the note
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API: for_each_note(): Traver
s
e the en
t
ire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
a
n
d
Notes
AP
I
: get
_
note(): Return the
n
ote an
n
otating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: rem
o
ve
_
note(): Re
m
ove note
obj
e
cts f
r
om
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
Notes API: add_n
o
t
e
(
): A
d
d not
e
objects to the interna
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API
:
init_
n
ote
s
(): Initialize the not
e
s tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rland
A
dd t
e
sts f
o
r checking
correct handling of $
G
IT_NOTE
S
_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes API: get_
c
ommit
_
notes()
-
> format_note() + remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
H
e
rlan
d
Minor co
s
metic fixes to n
o
tes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an
H
erlan
d
buil
t
in-config:
Fix crash when using "-f <
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Ad
d
more te
s
tcas
e
s
t
o t
e
st fast-
i
mport of no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan
Herland
Rename t9
3
01 to t9350, to
m
ake room for mor
e
fa
s
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
fast-import: Proper n
o
tes t
r
ee man
i
pulatio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Her
l
and
F
ix
crasher on
e
ncoun
t
er
i
n
g
SHA1-like non-note
i
n
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
B
a
s
ic build infrastruc
t
ur
e
for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Ad
d
selftests ve
r
ifying concatenation of
m
ul
t
iple not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Ref
a
ctor notes code to concatenate multiple
notes a
n
notating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
r
land
Add selftest
s
verifying t
h
at we c
a
n parse notes tr
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
Te
a
ch t
h
e note
s
lookup code
t
o
parse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
Te
a
c
h note
s
code
t
o free its
i
ntern
a
l data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
dd fl
a
gs to get_com
m
it_note
s
(
) to
contro
l
the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
He
r
land
t3302-n
o
tes-index-expensive: Speed u
p
create_
r
epo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
fast-import
:
Add support for
i
mporting commit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan He
r
lan
d
Teach
"-m
<msg>" and "-F <file>" to "git note
s
edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Her
l
a
n
d
git clone
:
Add --recursive to automaticall
y
che
c
k
o
ut
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
o
h
an
H
erland
t7
4
07: Use 'rev-pars
e
-
-shor
t
' r
a
ther than
bas
h
's s
u
bstr
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herland
git submodul
e
s
ta
t
u
s: Add
--recursive to
r
ecurse
i
nto
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n Herland
git submodule update: Introduce --recursive to
up
d
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git subm
o
d
ule
foreach: Add --recursi
v
e
to recurse in
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
erl
a
n
d
git su
b
m
o
dule foreach: t
e
st
acces
s
to submodule nam
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
a
n
d
Add sel
f
test for 'git submodule f
o
reach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
a
n
Herland
git submodule: Cleanup usag
e
stri
n
g a
n
d add
o
ption
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herland
git submodule forea
c
h: Provi
d
e ac
c
e
s
s to submodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan
Herlan
d
he
l
p
.
c
:
give correct
structure'
s
s
i
ze to mems
e
t()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quickfet
c
h():
P
re
v
ent overfl
o
w
o
f the rev-lis
t
command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
git-submodule
:
a
dd
s
upport for --merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Re
n
ame submodule
.
<name>
.
rebase
t
o
s
u
b
modu
l
e
.
<na
m
e>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Joh
a
n Herlan
d
Update d
o
cs on beha
v
iou
r
of 'core
.
share
d
Repos
i
tory
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
J
ohan Herland
Move chmod(foo, 0444)
into move_temp_to_f
i
l
e
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Jo
h
an Herlan
d
Use strchrnul() instead of str
c
hr(
)
p
l
us manual workarou
n
d
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan He
r
l
a
nd
Fix sub
m
o
d
u
le sync with relative submodule URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herlan
d
for-
e
ach-ref
:
F
ix --format=%(su
b
jec
t
) for log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
J
o
han He
r
land
Fix AsciiDoc errors in mer
g
e documentation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Johan H
e
rlan
d
Br
i
ng l
o
cal clone
'
s ori
g
in URL i
n
line with that o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
J
o
han Herland
T
e
ach "git d
i
ff -p" H
T
ML
f
u
ncname pat
t
erns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Joh
a
n H
e
r
l
a
nd
Teach
"
gi
t
clon
e
" t
o
p
ack ref
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan
Herland
Prepare te
s
t
s
uite for a
"git
clon
e
" that packs
r
efs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan
Herland
Move pack_refs(
)
a
nd friends
into libgi
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Joh
a
n Her
l
a
n
d
In
c
orpo
r
ate fetched packs in future object traversal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herland
The "curl" executa
b
le is
n
o lon
g
er required
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
J
o
han Herland
C
o
nsistency: Use "libcurl" instead of "cURL
l
ibrary
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Her
l
and
cpi
o
is no long
e
r used b
y
git
-
clone
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan Herland
Add test
f
o
r
c
loning with "--r
e
ference" repo being
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Joh
a
n Herland
Add a tes
t
for a
n
other combi
n
at
i
on of --
r
eference
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
J
ohan Herland
F
i
x 'git cvsexportcommit -w $cvsdir
.
.
.
' when us
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Joha
n
Herland
Add te
s
tcas
e
for '
g
it cvsexportco
m
mit -w $cvsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
J
ohan H
e
rl
a
nd
Fix 'git c
v
sexp
o
rtcommit -w $cvs
d
ir
.
.
.
'
whe
n
u
s
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
Johan Her
l
and
A
d
d tes
t
case for 'git cv
s
export
c
ommit -w
$
cvsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next