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
Joha
n
Herland
push
.
default:
R
ename '
t
r
ackin
g
'
t
o 'upstr
e
am'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
Provide 'gi
t
mer
g
e --abort' as
a synonym to 'git res
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
cmd_merge(): Parse opti
o
ns
b
e
fore c
h
ecking ME
R
GE_HEA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Provide 'git
n
otes
get-ref' to easi
l
y retri
e
v
e current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merg
e
: A
d
d testcases for me
r
ging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes merge
:
Add another aut
o
-
r
esolving str
a
tegy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes mer
g
e: --commi
t
should fail i
f
und
e
rlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes merge: List conflicting notes in notes
mer
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herla
n
d
git notes
m
erg
e
: Manu
a
l
c
onflict resolution, pa
r
t 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
land
git not
e
s merge: Manual
con
f
lic
t
resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
Docu
m
en
t
a
tion
:
P
r
elim
i
nary
d
ocs
on 'g
i
t
n
o
tes mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge
:
Add automatic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
gi
t
notes merge: Handle real, no
n
-conflicting
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
uiltin/n
o
tes
.
c: Refactor c
r
ea
t
i
on of no
t
es commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erland
git notes merge:
I
nitial implementation ha
n
dling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bu
i
ltin/notes
.
c: Split
notes ref D
W
I
Mmery int
o
a sepa
r
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
no
t
e
s
.
c
:
U
se two new
l
i
n
e
s
(
instead of
one)
when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
and
(tr
i
vial) t3303: In
d
ent wi
t
h tabs i
n
stead of space
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
l
a
nd
n
otes
.
h
/
c: Propagate combine_no
t
es_fn retur
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
h
/
c: A
l
low combine_notes
f
unctions to r
e
mov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
c: R
e
order funct
i
ons in
p
reparation
for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
h
: Mak
e
defa
u
l
t
_
notes_
r
e
f()
a
vailable in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
t
r
ivia
l
) notes
.
h: Minor documentatio
n
fi
x
es to
c
o
p
y
_
notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
:
H
ex
i
fy
SH
A
1 in die() m
e
ssag
e
from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
Herland
notes: Don't create
(
empty) commit whe
n
removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an
Her
l
and
Enable custom sc
h
e
mes fo
r
c
o
lumn color
s
in the gr
a
ph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herlan
d
Make
g
r
aph_nex
t
_line()
a
v
ail
a
ble
in
t
h
e
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
e
vis
i
o
n: Turn of
f
history simplificati
o
n in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
r
l
a
n
d
rev
i
sio
n
:
F
ix typo in --ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han H
e
rla
n
d
Documentation
/
rev-list-op
t
ions
.
txt: E
x
p
lain --a
n
cest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
D
ocumentation/rev-list-op
t
ions
.
txt: Fix miss
i
ng line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c
:
E
nsu
r
e "index
$from
.
.
$to" line contains unambig
u
o
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan Herland
builtin-notes: Minor (
m
o
st
l
y parse_optio
n
s-rela
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herl
a
nd
s
ub
m
o
d
u
le s
u
mm
a
r
y:
D
on't barf when
i
nvoked in a
n
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
bu
i
lti
n
-
notes: Add "copy" subcom
m
and for
c
o
pyin
g
note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herla
n
d
b
u
iltin-notes: Misc
.
refactoring of argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
la
n
d
buil
t
in-notes: Add -c/
-
C
o
ptions for reusing no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
r
land
bui
l
tin-note
s
: Refactor hand
l
ing of -
F
op
t
ion to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
e
rland
builtin-no
t
e
s: Deprecate the -m/-F
options for "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin
-
notes: Add "append" subcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
buil
t
in-not
e
s:
A
dd "add"
s
ubc
o
mmand
for add
i
ng
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add
-
-message
/
--file aliases for
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes:
A
dd
"list" sub
c
o
m
m
a
n
d for listing not
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Documentation: Generalize
g
it-notes do
c
s
to
'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
buil
t
in-notes: Add "prune" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API
:
prune_n
o
tes(): P
r
une not
e
s that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305
:
Ve
r
i
f
y that rem
o
ving n
o
t
e
s tr
i
ggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes:
A
dd "
r
emov
e
" sub
c
o
mman
d
fo
r
remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Tea
c
h b
u
iltin-notes to r
e
move e
m
pt
y
not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Her
l
and
Tea
c
h
notes code to properly preserve non-note
s
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
t3305: Verify that adding ma
n
y n
o
tes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t
3301:
Verif
y
succ
e
ss
f
u
l annotation o
f
non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-ify git-n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
R
e
factor notes
c
on
c
atenat
i
on in
t
o a flex
i
ble interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
N
o
tes API: Allow multiple
c
oncurren
t
notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API:
write
_
notes_tree():
S
t
ore the n
o
tes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
Notes API:
f
or_
e
ach_note(): Traverse the en
t
ire no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_note(): Retur
n
the note an
n
o
t
ating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: re
m
ove_n
o
te(
)
:
Remov
e
note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
Not
e
s
API: add_note(
)
: Add note obj
e
cts to the
internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
N
o
t
e
s API: init_not
e
s
(): Initializ
e
the notes
t
r
ee
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
an
d
Add tests
fo
r
checking corr
e
ct
h
andling of $
G
IT_NOTE
S
_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes AP
I
: get_
c
ommit_notes() -> format_note
(
) + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
Minor cosme
t
ic fixes t
o
notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-co
n
f
i
g
:
Fix cra
s
h when
u
sing "-f <rel
a
t
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erland
Add more testc
a
ses to tes
t
fast-
i
mpo
r
t of note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an He
r
l
and
Rename t9301 to t9
3
50, t
o
make room
for more fast-im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herland
fa
s
t-i
m
port:
P
rop
e
r
n
otes tree
manipula
t
i
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan
H
erland
Fix
cras
h
er on encountering
SHA1-like non-note
i
n
n
o
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Bas
i
c build
infras
t
ructure for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d
s
elftests ver
i
fying concatenation of mu
l
ti
p
le notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refactor no
t
es co
d
e to c
o
ncate
n
ate multiple notes a
n
notating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
dd selftests verifying that we can parse notes t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach the notes lookup c
o
de to parse
n
otes
t
r
e
es wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
l
a
n
d
T
e
ach notes code to free it
s
internal
da
t
a structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add flags to
g
et_co
m
mit_notes() to contr
o
l the forma
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
He
r
l
and
t330
2
-notes-index-expensive: Speed
u
p create_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
a
n Herland
fas
t
-i
m
port: Add support fo
r
i
mpo
r
ting commit
n
otes
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 e
d
i
t"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clone: Ad
d
--recursive to
a
utom
a
ticall
y
che
c
kout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
ohan Herlan
d
t7407:
Use 're
v
-p
a
rse --short'
r
at
h
er than bas
h
's s
u
bstring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herla
n
d
gi
t
submodule status: Add
-
-
recurs
i
v
e to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule update: Introdu
c
e
-
-recurs
i
ve to
u
pdat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan He
r
lan
d
git s
u
bm
o
dule foreach: Add -
-
recur
s
ive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an
Herland
git submodule f
o
reach: test ac
c
ess to su
b
mod
u
le nam
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
r
l
an
d
Add selfte
s
t for 'git submo
d
ule foreach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
ha
n
Herl
a
nd
git su
b
module: Cleanup usage
string an
d
ad
d
o
ption
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan
H
erland
git submodule foreach:
P
r
ovide a
c
cess to submodu
l
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan
Herlan
d
he
l
p
.
c:
give
c
orrect structu
r
e's size t
o
mem
s
e
t
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Joh
a
n Herland
quickfetc
h
(): Preve
n
t over
f
low of the rev
-
l
i
st
command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Joha
n
Her
l
a
n
d
git-submodule:
add s
u
p
po
r
t for --me
r
g
e
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Re
n
ame
submodule
.
<name>
.
rebase t
o
submodu
l
e
.
<
na
m
e>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
Update docs
on beh
a
viour of 'core
.
sharedRepository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan
H
erland
Move chmod
(
f
o
o
, 0444) into move_temp_to_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Jo
h
an Herland
Use strchr
n
u
l
()
i
n
stead of strchr()
plus manu
a
l w
o
r
k
a
r
ound
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
Fi
x
submodule sync with
r
e
lative submo
d
ule URL
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
J
ohan Herl
a
nd
for
-
ea
c
h-ref: Fix
-
-form
a
t=%(subject) for log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan H
e
rl
a
nd
Fix AsciiDoc er
r
ors in merge
d
ocumentation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
J
o
han
H
erland
Bring l
o
cal clone's o
r
igin URL in
lin
e
w
i
th
t
h
at of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herland
Teach "git diff -p"
H
T
M
L funcname patterns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next