repo.or.cz
/
git
/
jrn.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: Add another auto-resolving strategy: "cat_sort_uniq"
2010-11-17
J
o
han Herla
n
d
git n
o
tes merge: Add
a
noth
e
r au
t
o
-
res
o
lv
i
ng strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes me
r
ge: -
-
commi
t
should fail
i
f u
n
derlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herl
a
nd
git notes merge:
L
ist conflicti
n
g notes
in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git n
o
t
es
m
e
rge: Manual conflict reso
l
u
tion, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herlan
d
git notes merge: Ma
n
ual c
o
nflict
reso
l
ution, par
t
1/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Her
l
and
Documentat
i
on: Preliminary docs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
git notes me
r
ge: Add automatic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
r
land
git
notes merge
:
Handle real, non-
c
o
n
flicting
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
uilt
i
n/note
s
.
c
: Re
f
actor creation of notes c
o
mmits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git not
e
s merge: Initial implementation hand
l
ing trivi
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Split notes ref DWIMmery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use two newl
i
ne
s
(inst
e
ad of one) when c
o
ncatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
(trivial) t3303: I
n
d
ent w
i
th tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
tes
.
h
/c: Pro
p
agate comb
i
ne_notes_fn re
t
urn
va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/
c
: Allow
combi
n
e_no
t
es func
t
ions to re
m
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Reor
d
er functions in
p
r
e
paration
f
or next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Her
l
and
no
t
e
s
.
h: Make defa
u
lt_not
e
s_ref() avail
a
bl
e
in
notes A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
(trivial) n
o
tes
.
h: Minor
d
ocu
m
entation fixes to copy
_
not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
c:
H
exify
SHA1
i
n
die(
)
message from init_
n
ote
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han
H
e
r
land
r
e
visi
o
n: Turn off histo
r
y simplification
in
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
revision:
F
ix t
y
p
o
i
n
-
-
a
n
cestry-path er
r
or mess
a
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
rland
Docu
m
enta
t
io
n
/rev-li
s
t-options
.
txt: Explain --anc
e
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
Docum
e
nta
t
io
n
/rev-list-options
.
t
xt:
F
ix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure
"
index
$
fro
m
.
.
$to
"
line contain
s
unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Her
l
a
nd
bui
l
tin-notes: Minor
(mostly p
a
rse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
submodule summary: Don't barf when invok
e
d in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
built
i
n-notes: Add "c
o
py" s
u
bcomm
a
nd for
c
o
p
ying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-notes:
M
isc
.
refactoring of argc and exit valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add -c/-C optio
n
s for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
builtin
-
not
e
s:
R
efact
o
r han
d
ling of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: Dep
r
ecate the -m/-F option
s
for
"
git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
bu
i
ltin-notes: Add "append" subcommand fo
r
a
p
pend
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
builtin-notes: Add "
a
dd" subco
m
ma
n
d
for adding
n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin
-
notes: Add --message/-
-
file
a
li
a
ses for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
bui
l
tin-notes:
A
dd "list"
s
ubcomma
n
d
f
or l
i
sting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
Doc
u
mentation: Ge
n
e
ralize g
i
t-n
o
tes docs to 'o
b
jects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-no
t
es: Ad
d
"prune"
s
ubcom
m
and f
o
r removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
N
otes API: pr
u
ne_notes(): Prune not
e
s that belo
n
g to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
t33
0
5: Verify that removin
g
notes trig
g
e
rs automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
u
i
l
tin
-
notes:
A
d
d
"remove" subco
m
m
a
nd for
re
m
ov
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach buil
t
in-notes to remove empt
y
n
ote
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herlan
d
Te
a
ch notes co
d
e to proper
l
y preserve non-notes
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t330
5
: Verify t
h
a
t adding m
a
ny notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
t
3
301: Verify s
u
cces
s
ful annotation of n
o
n-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
B
u
iltin-ify git-n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n
H
e
rland
Refa
c
to
r
no
t
es co
n
catena
t
ion into a flexible
interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API:
A
llo
w
mul
t
ip
l
e concurrent note
s
trees wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API
:
write_
n
o
t
es_tree(): Store
the notes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
N
o
tes API: for_ea
c
h_note(): Traverse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
N
o
tes API: get_note():
R
eturn the n
o
te anno
t
ati
n
g
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API: remo
v
e_note():
R
emov
e
note objects fr
o
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
Notes API
:
add_
n
ote(): Add note objects to the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes
A
P
I: ini
t
_
n
ote
s
(): Initi
a
liz
e
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Add tes
t
s for c
h
ecking cor
r
e
ct han
d
li
n
g of $GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
No
t
es API:
g
e
t_commit_notes() -> format_note
(
) + re
m
ove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
M
i
nor cosmet
i
c fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
o
h
an Herlan
d
builtin-con
f
ig:
F
ix crash when u
s
ing "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan He
r
land
Add more testcases
to
test fast-imp
o
rt of not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herland
Rename t9301 to
t9350, to m
a
ke room for
m
ore
f
ast-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast
-
i
m
p
ort
:
Pro
p
e
r notes tree manipu
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joha
n
Herlan
d
Fix crash
e
r on encount
e
r
ing SHA1
-
like non-
n
ote in n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
a
n
Herl
a
n
d
Basic b
u
ild infra
s
truc
t
ure for Pyt
h
on
s
crip
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Her
l
a
n
d
Ad
d
selftests
v
erifyin
g
concatenation of mul
t
iple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erla
n
d
Refactor notes co
d
e t
o
concat
e
na
t
e multiple notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herl
a
n
d
Ad
d
se
l
ftests
veri
f
ying that we
c
an parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan He
r
lan
d
Teach
the
n
otes l
o
okup code to pars
e
notes tr
e
es
w
ith
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Tea
c
h notes
c
ode
to free i
t
s int
e
rna
l
data stru
c
tu
r
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han H
e
rland
Add f
l
a
gs to get_comm
i
t_n
o
t
es() to cont
r
o
l
t
he format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302-no
t
es-index
-
expe
n
sive:
Speed up create_repo
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
a
n He
r
la
n
d
fast-import: Add sup
p
ort for im
p
ortin
g
com
m
it
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erla
n
d
Teac
h
"-m
<msg>" and "-F
<
file>" to "gi
t
notes edi
t
"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Jo
h
a
n
H
erland
git
c
lone: Add --re
c
ursive to automatically
c
heckout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t7407: Use 'rev
-
parse
--s
h
o
rt'
r
athe
r
than bash's substrin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan
Herland
git submodule statu
s
: Add --re
c
ursive to recurse i
n
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule update:
Introduce --recursi
v
e
t
o update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herla
n
d
git submodule forea
c
h: Add --recursi
v
e
to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herl
a
nd
git s
u
b
mo
d
ule fore
a
ch: test access to submodule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan He
r
lan
d
Add selftest for 'git su
b
module
for
e
ach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
gi
t
submodule: Cleanup usage string and
a
dd option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan H
e
rl
a
n
d
gi
t
submodule
f
o
reach: Provide access to
s
ubmodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan H
e
rland
he
l
p
.
c:
give corr
e
ct
s
tructure's si
z
e
t
o
m
emset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quic
k
fetch():
P
r
event overflow o
f
the
rev-list co
m
mand
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
han Herland
git-subm
o
dule:
a
d
d
s
upport for -
-
merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herlan
d
R
e
name
s
ubmodu
l
e
.
<
n
ame>
.
rebase to submodule
.
<
name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
J
o
h
a
n
H
erl
a
nd
U
p
d
a
t
e
do
c
s on beh
a
viour of 'co
r
e
.
s
h
a
redRe
p
ository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
J
ohan He
r
la
n
d
Mov
e
chmo
d
(foo, 04
4
4) 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 Herland
Use strchrnu
l
()
i
nstead of strchr(
)
p
lus manual workaroun
d
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
Fix su
b
modu
l
e sync with relative submo
d
ule URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Joh
a
n H
e
rla
n
d
for-each-ref:
Fix --format=
%
(s
u
b
ject)
f
or log mes
s
a
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Joh
a
n Her
l
and
Fix
AsciiDoc erro
r
s in merge documentation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Johan
Herland
B
ring local
clone's origin URL i
n
line with t
h
at of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Johan
Herland
T
e
a
c
h "git
diff -p"
HTML fun
c
name pat
t
erns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan H
e
r
land
T
each "git clone" to pac
k
r
e
fs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Prepa
r
e
tes
t
su
i
te for a
"
git
c
lone"
t
ha
t
p
acks refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan H
e
rland
Move p
a
ck_re
f
s() and friends into libgi
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herlan
d
Inc
o
rporate fet
c
h
e
d pa
c
ks in
f
u
ture
o
bje
c
t tr
a
versal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
J
ohan Herland
The "c
u
rl" e
x
ecutable is no longer re
q
uired
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan He
r
l
a
nd
Consistency: Use "li
b
curl" inst
e
ad o
f
"
c
URL librar
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Jo
h
a
n Herland
cpio
is no l
o
ng
e
r used by git-clone
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Joh
a
n
Herland
A
dd test for cloning with "--
r
eference" repo being
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next