repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cmd_merge(): Parse options before checking MERGE_HEAD
2010-11-17
J
o
han Herland
cmd_mer
g
e
():
Parse options before ch
e
c
ki
n
g MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
H
erland
Provide '
g
it not
e
s get-re
f
' to
e
as
i
ly retrieve curr
e
nt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herlan
d
git notes merge
:
A
d
d te
s
tcases f
o
r mergi
n
g not
e
s trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
git notes merge: A
d
d another
auto-r
e
sol
v
ing strat
e
gy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: --co
m
mit
should
f
ail if under
l
yin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
git note
s
merg
e
: Lis
t
conflic
t
ing n
o
tes in
n
otes mer
g
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git notes merge: Man
u
al conflict resolut
i
on,
part 2/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herland
git notes m
e
rge: Manual confli
c
t r
e
s
oluti
o
n, pa
r
t
1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docu
m
entation: Preli
m
i
n
ary
d
o
c
s on 'gi
t
n
otes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git
n
o
tes merge: Add automatic c
o
nflict re
s
olvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rland
git not
e
s merge: Handle
r
eal, non-con
f
li
c
t
ing not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
er
l
a
nd
builtin/notes
.
c: Refa
c
tor
creation of notes
commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
gi
t
notes merge: Initial i
m
pleme
n
tati
o
n handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
land
buil
t
i
n
/notes
.
c: Sp
l
it note
s
ref
D
WIMmery
i
nto a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
notes
.
c: Use two new
l
ines (instead of one) when concaten
a
tin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
(trivi
a
l
) t3303: Indent with
tabs
i
nstead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
notes
.
h/c: Propagate
c
ombi
n
e_n
o
tes_fn return val
u
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
h
/
c: Allow combine_notes func
t
i
o
ns to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
ha
n
Herland
not
e
s
.
c: Reorder functions in p
r
eparati
o
n for nex
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
h: Make def
a
ul
t
_notes
_
r
e
f() av
a
ilable in no
t
e
s API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivia
l
) notes
.
h:
M
inor documentation
fixes t
o
copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
He
r
land
notes
.
c:
Hexify SHA1 in die
(
) messa
g
e
from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
e
rland
revision: Turn o
f
f history simplificat
i
on
in
-
-ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
revisio
n
: Fix typo in --an
c
estr
y
-path error messag
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev-list-opt
i
ons
.
txt: Expl
a
in --ancestr
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documenta
t
ion/rev-
l
is
t
-option
s
.
t
xt: Fix
m
i
s
sing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Her
l
an
d
d
iff
.
c
:
E
n
su
r
e
"
i
n
dex $fr
o
m
.
.
$to" line contains un
a
mbigu
o
us
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-not
e
s:
Mi
n
or
(mos
t
ly par
s
e_o
p
tions-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han H
e
rland
submodule summary: Don't barf when
invo
k
ed in an em
p
ty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
builtin-n
o
te
s
: Add "copy"
s
u
bcommand f
o
r
c
opying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
e
r
la
n
d
builtin-notes:
Misc
.
refactoring
of
a
rgc and exit
v
al
u
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
builtin-notes:
A
dd -
c
/-C
o
p
t
ion
s
fo
r
reusin
g
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rla
n
d
built
i
n-notes: Refact
o
r
handl
i
ng of -F opti
o
n to a
l
low
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
builtin-notes
:
D
e
prec
a
te
t
he -
m
/-F options fo
r
"g
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
bu
i
ltin
-
notes: Add "append" su
b
command for app
e
ndin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
built
i
n-notes: Add "add" subcommand for add
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
builtin-no
t
es: Add --message/--fi
l
e
a
liases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
builtin-n
o
t
es: Add "list"
s
u
b
comma
n
d for list
i
ng note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Docu
m
entation: Generalize git-notes docs to 'objec
t
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
bui
l
tin-notes: A
d
d "prun
e
" subcomma
n
d
for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: prune_notes(): Prun
e
notes tha
t
belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t
3
305: V
e
r
ify that removing note
s
triggers
a
uto
m
at
i
c
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
builtin-notes:
A
dd "r
e
m
ove" subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
Teach bui
l
tin-n
o
tes to remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Teach not
e
s code to p
r
ope
r
ly
p
r
eserve non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
er
l
and
t3305: Ve
r
ify that adding
m
an
y
notes with git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herla
n
d
t3301: Ve
r
ify suc
c
essful an
n
otation of no
n
-co
m
mits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
Builtin
-
ify
git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Refactor notes con
c
a
tenation into
a flexible
i
nterfac
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes
A
PI: A
l
low mu
l
ti
p
le
c
onc
u
rrent
notes
t
rees 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 th
e
not
e
s
tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes
AP
I
: for_
e
ach_note(): Trave
r
se the e
n
tire
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API
:
g
e
t_note(): Retu
r
n
the no
t
e annot
a
ting the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
API: remove_n
o
t
e(): Remove note ob
j
ects fr
o
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes
API: add_note(): Add not
e
object
s
to the i
n
terna
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
Notes A
P
I
:
init_
n
otes(): Initialize
t
he notes t
r
ee
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Add
tests for c
h
ecking correct
h
andling of $GIT_NOTES_
R
E
F
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API:
g
et_co
m
m
i
t_notes(
)
-
>
f
ormat_no
t
e() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Minor
c
osmetic
fixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herla
n
d
bui
l
tin-con
f
ig: Fix crash when
using "-f <relat
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erland
Add more t
e
stca
s
es t
o
test fast-import of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herland
R
e
n
ame t9301
t
o
t9350
,
to make
r
oom for more
f
ast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herland
fast-
i
mpor
t
: Prop
e
r
no
t
e
s
tr
e
e
manipu
l
a
t
ion
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan
Herland
Fi
x
crasher
on encounteri
n
g SHA1-like no
n
-no
t
e i
n
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Her
l
and
Basic build infrastructure for Pyt
h
on s
c
ript
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
Add se
l
f
tests
veri
f
ying concatenation of multiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n He
r
land
Ref
a
ctor
n
otes
c
ode to c
o
ncat
e
nate
m
ultipl
e
no
t
e
s an
n
otating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d selfte
s
ts
verifying that we can parse notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
T
e
ach the
n
otes look
u
p code to
parse notes
tre
e
s with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
er
l
an
d
Te
a
ch notes code to free its internal data structures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herlan
d
Add flags t
o
get_comm
i
t_notes(
)
to cont
r
o
l the forma
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302-notes-i
n
dex-
e
xpensive: Speed up cr
e
a
te_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
rland
f
ast-import:
Add s
u
pport
fo
r
im
p
orti
n
g
commit notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
e
ach "-m <msg>" and "-F <file>" to "git notes edit
"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Joh
a
n
Herland
g
i
t
clone: Add --recursiv
e
to
a
utomatically
checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan
H
erla
n
d
t7407: Use 'rev-parse --short' ra
t
h
er than bash's
substr
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
git su
b
mod
u
le s
t
atus: Add --recursive
t
o
recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan He
r
land
git subm
o
dule update: Int
r
oduce --recursive to updat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herla
n
d
git sub
m
odule
f
oreach: Add --recu
r
sive to rec
u
rse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git su
b
m
odule for
e
a
ch: test acc
e
ss t
o
submodu
l
e name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
Ad
d
selftest
for 'g
i
t submodule foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
er
l
and
git
s
ubmodul
e
: Cleanup usage string an
d
add option
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
J
o
han Herla
n
d
g
it
s
ubmodule forea
c
h: P
r
ovid
e
a
c
c
ess to submodul
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Jo
h
an
Herland
help
.
c:
g
ive
c
orrect
s
tructure's si
z
e t
o
memset(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Joh
a
n H
e
r
land
quickfetch():
P
re
v
ent ove
r
flow of
the rev-list command
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
gi
t
-sub
m
odule: add s
u
pport for --merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan
H
erland
R
e
name submodule
.
<
n
ame
>
.
rebase to submodul
e
.
<name>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Johan
Herl
a
n
d
U
p
date do
c
s on behaviour o
f
'core
.
sharedRepos
i
tor
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Joh
a
n Herl
a
nd
Move
c
hmod(foo
,
0444) into move_temp_to_file(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herland
Use str
c
hrn
u
l() inste
a
d of
s
trchr() plus ma
n
ua
l
wo
r
k
a
r
o
und
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan
Herland
F
i
x submo
d
ule sync with relative submodule URL
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan
Herland
for
-
each-ref
:
Fix
--format
=
%(subject) for log messag
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
J
ohan H
e
rlan
d
Fix As
c
iiDoc err
o
rs i
n
m
erg
e
docu
m
entat
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-02
Johan Herland
Bring loc
a
l
c
lone's origin URL in line wit
h
t
hat of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herlan
d
Teac
h
"git diff
-p" HT
M
L funcname patt
e
rns
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Teach "git clone" to pa
c
k refs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
J
ohan Herland
Prepare
testsuite for
a
"git clone" that packs
ref
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
J
o
han Herland
Move pa
c
k_refs() and friends into lib
g
i
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Joha
n
Herland
Inc
o
rp
o
rate
f
etched packs
i
n future object
tr
a
versal
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-15
J
oh
a
n Herland
T
h
e "curl" ex
e
c
u
table is no longer required
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next