repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master' into next
2011-02-16
J
o
han
H
er
l
and
push
.
default: Rena
m
e 'track
i
ng' to
'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge --ab
o
rt'
a
s a sy
n
onym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
c
m
d_merge(): Parse options
befor
e
che
c
k
i
n
g MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provi
d
e
'git notes
g
et-ref' to ea
s
il
y
re
t
rieve
c
urr
e
nt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
g
i
t notes
m
erge: Add testca
s
es
fo
r
merging n
o
t
e
s trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge
:
Add a
n
other
auto-resolvi
n
g str
a
tegy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
g
it no
t
es merge: --com
m
it shoul
d
fail if und
e
r
lying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herlan
d
git notes m
e
rge: List conflicting
notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
git notes merge: Ma
n
ual c
o
nfl
i
ct
r
e
solution,
p
a
r
t 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git no
t
es merge:
M
a
nual conflict res
o
lution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentati
o
n
: Preliminary docs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
lan
d
git notes merge:
A
dd a
u
to
m
atic conflict
r
esolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git no
t
es merg
e
:
Han
d
le real, non
-
co
n
flicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
u
iltin/notes
.
c:
R
efactor crea
t
ion of notes
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git no
t
es merg
e
:
Initial implementatio
n
handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin
/
notes
.
c
:
Split
n
o
tes ref D
W
IMmery
into a se
p
arate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herlan
d
notes
.
c
:
Use tw
o
newlines
(instead o
f
on
e
) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3303: Indent with
t
a
b
s instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
notes
.
h/c: Propaga
t
e
combi
n
e
_notes_fn retu
r
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
notes
.
h/c: Allo
w
combi
n
e_notes functions to
remov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Reorder functi
o
ns in prepara
t
ion for
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Her
l
and
notes
.
h: Make default_notes
_
ref()
a
vailable
i
n n
o
tes
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
(trivial) notes
.
h: M
i
nor documentation fixes to
c
o
py_n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erla
n
d
n
otes
.
c: Hexi
f
y SHA1 in die
(
) message fro
m
init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
Herl
a
nd
not
e
s
: D
o
n
'
t
create
(
empty) commit
when r
e
moving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rl
a
n
d
En
a
b
l
e custom schemes for co
l
u
mn colors in the gr
a
ph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make gr
a
ph_n
e
xt_line() available i
n
th
e
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Turn off history s
i
mplification in --anc
e
str
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
He
r
land
revision:
Fix
t
ypo in
-
-ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herl
a
nd
Documentati
o
n/rev-list-options
.
txt: Expl
a
in --ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan He
r
land
Documenta
t
ion/rev-li
s
t
-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure
"
i
ndex $fro
m
.
.
$to" line contains
unambig
u
ous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
h
an Herlan
d
built
i
n-notes: M
i
no
r
(mo
s
tly parse_options-re
l
ated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
submodule summar
y
:
Don'
t
barf wh
e
n invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
buil
t
i
n
-notes: Ad
d
"
c
opy" subcom
m
and for c
o
pying note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-notes: Misc
.
refactoring o
f
a
rgc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-n
o
tes: Add -c/-C
options for re
u
sing
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin
-
n
o
tes: Re
f
actor han
d
ling of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
bu
i
ltin-not
e
s: Deprecate the -m/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
bu
i
ltin
-
notes: Add "append"
subcommand for a
p
pending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
builtin-no
t
es:
A
d
d
"add" subcommand for
a
dd
i
ng note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
u
iltin-notes: A
d
d --
m
es
s
a
g
e/--fi
l
e a
l
ia
s
es for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-n
o
tes: Add "list"
su
b
co
m
mand for
l
i
sti
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
Documen
t
ation: Generalize git-notes docs to 'objec
t
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-n
o
tes: A
d
d "p
r
une" s
u
bcommand for rem
o
v
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
N
otes
A
PI: pr
u
n
e_
n
otes(): Prune
notes t
h
at belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify that remo
v
ing
notes triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
l
t
in
-
not
e
s: Add "remove" subcommand fo
r
r
e
movin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach bui
l
t
i
n
-n
o
tes
t
o
r
emove
empt
y
n
o
te
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
n
otes co
d
e t
o
properly
p
reserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t3305: Verify that addi
n
g many notes
with git-n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
t3301: V
e
rify succes
s
ful annotation of n
o
n-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Builtin-ify git-n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Refactor
notes c
o
n
c
atenation into a flexible i
n
terface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
l
a
nd
Note
s
A
P
I: Allo
w
multipl
e
concurrent n
o
tes tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
N
ote
s
A
PI: write_notes_tree():
S
t
ore the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Notes
API:
for_each_note()
:
T
r
averse the entire
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
N
o
tes API:
get_note(): Return t
h
e
note anno
t
ating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
Notes API
:
remove_note():
R
e
m
ov
e
n
ot
e
objects f
r
om
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
r
land
N
o
tes API: add_no
t
e(): Add n
o
te objects to
the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API: init
_
notes()
:
Initial
i
ze the notes
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
Add tests
for checkin
g
c
orrect han
d
ling o
f
$GIT_NOT
E
S_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
N
otes API: get_commit_n
o
te
s
() -> format_no
t
e() + re
m
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
M
i
nor
cosme
t
i
c fix
e
s to note
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herlan
d
bu
i
lti
n
-config:
F
ix crash when usi
n
g
"
-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Ad
d
more
t
estcases to te
s
t fast-i
m
port of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n
H
erland
Re
n
ame t93
0
1 to t9
3
50, to make r
o
om
f
or
more fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
e
r
land
fast-import: Proper n
o
t
e
s tree manipul
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan He
r
l
and
Fix crasher on enco
u
nte
r
ing SHA1-like
n
o
n
-note in no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
B
a
sic build
i
n
frastru
c
ture f
o
r Py
t
hon scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an
Herland
Add
selft
e
s
ts
verifying concatenat
i
on of mult
i
ple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refacto
r
n
o
tes
code to
concatenate m
u
lt
i
p
le notes annotat
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
A
d
d selftests verifying
t
h
a
t we can
p
a
rse notes tr
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach the notes look
u
p co
d
e to parse notes tree
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
Teach notes
c
ode to free its inte
r
nal data s
t
ructures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
a
nd
Ad
d
f
l
ags t
o
get_commit_notes() to
c
ontr
o
l the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herl
a
nd
t3302
-
notes-index-expensi
v
e: Spe
e
d up c
r
eat
e
_re
p
o()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fast-
i
mport: Add support
f
o
r
importing c
o
mmit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herlan
d
Teach "-m <ms
g
>"
a
n
d
"-F <f
i
le>" to "git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan
He
r
land
g
it
c
l
o
ne: Add --rec
u
rsive to automatic
a
lly checkou
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herlan
d
t
7
40
7
: Use
'rev-pa
r
se --short' rather than bash's
s
u
bstrin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
g
i
t
submodule
s
t
a
t
u
s
: Ad
d
--
r
ecursive to
r
ecurse
in
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n H
e
rland
gi
t
s
u
b
modu
l
e update:
I
n
tr
o
d
uce --recur
s
i
ve to update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodul
e
fo
r
each:
Add --recursive to rec
u
rse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git su
b
module foreach: test
a
c
c
ess to sub
m
odul
e
name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
A
d
d selftest for
'git
s
ubmodule foreach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han
H
e
r
l
and
git submodule: Clean
u
p usag
e
string and add option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herland
git
s
ubm
o
dule fo
r
eac
h
: Provide
access to submodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
J
o
han Herland
help
.
c: gi
v
e correct structure's size to mems
e
t()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
J
ohan H
e
rland
quickf
e
tch
(
)
:
Pre
v
ent overflo
w
o
f
the
rev-list command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan He
r
land
git-submodule: add supp
o
rt for --me
r
ge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
han H
e
rland
Renam
e
submodule
.
<n
a
me>
.
rebase to submodul
e
.
<na
m
e
>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Joha
n
H
e
r
l
and
Update do
c
s
on behaviour of 'core
.
sh
a
re
d
Reposito
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Joh
a
n Herland
Mo
v
e chmod(foo,
0444) into
move_temp_to_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herland
Use
s
trch
r
nul() instea
d
of strchr() plus manual workaround
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
F
i
x
s
ubmodule sync with relative subm
o
d
u
l
e
URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan
Her
l
and
f
o
r-each-ref: Fix
-
-
f
ormat=%(subject) for log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
J
ohan Herland
Fix Ascii
D
oc errors
i
n merg
e
documentati
o
n
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 line with that o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herl
a
n
d
Teach
"
git dif
f
-
p
"
H
TML fu
n
cnam
e
pattern
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next