repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
push.default: Rename 'tracking' to 'upstream'
2011-02-16
Joha
n
Herla
n
d
p
ush
.
default: R
e
name
'tracki
n
g' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
P
rovide 'g
i
t merge --abort
'
as a syno
n
ym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge
(
): Parse
options
b
efor
e
c
hecking M
E
RG
E
_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
Pr
o
vide 'git notes
g
e
t-ref' to easily r
e
trieve curren
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
notes m
e
rge: Ad
d
testca
s
e
s
f
or
m
ergi
n
g notes tr
e
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes merge: Add ano
t
h
er auto-res
o
lving st
r
a
t
e
gy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
git notes me
r
ge: --commit should
f
ail if underl
y
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
l
and
git
n
otes merge: List conflict
i
ng notes in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herla
n
d
git
n
o
t
es
m
erge
:
Manu
a
l conflict res
o
lutio
n
, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git n
o
tes merge: Manual conflict resolution, p
a
rt 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Documentatio
n
:
Preli
m
inary docs on
'
g
it not
e
s
m
erge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
land
g
i
t notes merge: Add autom
a
t
i
c con
f
li
c
t resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
Ha
n
dle
r
eal, non-conflict
i
ng
n
o
t
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/
n
otes
.
c
:
R
e
factor creation of notes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git
notes me
r
ge: Initial impl
e
ment
a
tio
n
handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
r
l
and
b
uilti
n
/not
e
s
.
c: Spli
t
not
e
s ref DWI
M
mery in
t
o a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use tw
o
ne
w
lin
e
s (ins
t
e
ad of on
e
) whe
n
concat
e
n
a
tin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
(trivial) t
3
303
:
Indent with
t
abs
instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
n
o
te
s
.
h/c: Propagate combine_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n Herland
notes
.
h
/c: A
l
l
ow combine_not
e
s functions to remo
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
e
r
lan
d
notes
.
c
:
Re
o
rder
f
unctions i
n
pr
e
para
t
ion
f
o
r next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
h: M
a
ke default_no
t
es_ref() av
a
i
lable in n
o
tes A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Her
l
and
(triv
i
al)
n
o
tes
.
h: Minor do
c
ume
n
t
a
tion fixes to
c
opy_
n
ot
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
c:
Hexify SHA1 in di
e
(
) m
e
ssag
e
from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
an Herland
no
t
es: Don't
c
reat
e
(e
m
pty) commit when removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Herla
n
d
Ena
b
le
c
ustom sch
e
mes for col
u
mn colors
in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
He
r
l
and
Mak
e
g
raph_
n
ext_line() ava
i
lable
in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
e
rland
revis
i
on
:
Turn off history simpl
i
f
ication
i
n --ance
s
t
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix typo in --ancestry-path error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Document
a
tion/rev-li
s
t-op
t
i
ons
.
txt: Explain
-
-ances
t
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
Documentation/re
v
-list-options
.
t
x
t:
F
ix
missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure "index $
f
rom
.
.
$to" l
i
ne conta
i
ns
u
nambig
u
ous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herlan
d
builtin-n
o
tes
:
Minor (mos
t
ly pa
r
se
_
opt
i
ons-relat
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule
summary:
D
on't
b
arf
w
hen invoked in an
e
m
p
ty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-not
e
s: Add "copy"
subc
o
mmand fo
r
copyi
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
b
uilti
n
-note
s
: Misc
.
refac
t
oring of ar
g
c and
e
xit valu
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
built
i
n-notes:
A
dd -
c
/
-C o
p
t
ions
for reusing
note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-not
e
s: R
e
f
a
ctor hand
l
ing of -F opti
o
n to allo
w
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
bui
l
tin-notes: D
e
precat
e
the -m/-F options for "gi
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes:
Add "append" s
u
bc
o
mmand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es: Add
"add" subcomman
d
for
adding
n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin
-
n
otes:
A
dd --message/--file aliase
s
for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-note
s
: A
d
d "list" subcommand f
o
r lis
t
ing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
l
a
nd
Documentation: G
e
nera
l
ize
g
it-no
t
es docs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
builtin-notes:
Add "prune" subcommand
f
or remo
v
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Note
s
API: prune_not
e
s(): Prune note
s
that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3305: Ve
r
ify t
h
at removing notes trigger
s
automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes: Add "remove" subcommand
for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Teach bu
i
ltin-notes
t
o remove empty
note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach note
s
c
ode
t
o
properly preserve non-n
o
tes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
t3305: Ver
i
f
y
that ad
d
i
n
g many notes
w
ith
g
it-no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
01: Verif
y
succe
s
s
f
ul an
n
ot
a
tion of non-
c
ommits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
Builti
n
-ify git-note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refacto
r
not
e
s conca
t
enation into a fle
x
ible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
AP
I
: Allo
w
m
u
l
tiple
con
c
urrent notes tre
e
s
with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API: wri
t
e_notes_tre
e
(
): Store t
h
e notes
t
ree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
Notes A
P
I: for_each_note(
)
: Traverse t
h
e entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Not
e
s API:
g
et_note(): Return the note annotating t
h
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API: remove_note(): Remove note ob
j
e
cts from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Notes API: a
d
d_
n
ote()
:
Add note
o
bje
c
ts to the i
n
ternal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
: init_note
s
(): Initia
l
ize the
note
s
t
ree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Add tes
t
s for
c
h
ecking
c
or
r
ect handl
i
ng of $
G
IT_NOTES
_
REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
nd
Notes API: get_commit_notes() -> format_note() +
remov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Minor
cosmetic fix
e
s to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Her
l
and
builtin-config: Fix c
r
a
s
h
when usin
g
"
-
f <rel
a
tive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
rland
Add more testcases to test fa
s
t
-
i
mport
of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erland
Rename t93
0
1
to t9350
,
to
make
r
oom for
m
ore f
a
s
t-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herla
n
d
fast-import: Proper
no
t
es tree manipu
l
ati
o
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix crasher on encountering SHA1
-
like
non-n
o
te in no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan
H
e
rland
Basic bu
i
l
d
infr
a
structure
f
or P
y
thon scr
i
pts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han He
r
land
Add selftests verifyin
g
c
onc
a
tenation of m
u
l
t
i
ple
n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
er
l
a
n
d
R
efac
t
or note
s
code to
concatena
t
e m
u
ltipl
e
no
t
es annotating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d
s
elftests
v
erify
i
ng that we can parse notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach th
e
notes look
u
p code
t
o
p
a
rse notes t
r
ees wit
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herl
a
nd
T
e
ach notes cod
e
to free its interna
l
d
ata structures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add
flags to get_com
m
it_notes() to control
t
he format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an Herland
t3302-notes-
i
nde
x
-ex
p
en
s
ive:
S
p
eed u
p
create_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fast-i
m
po
r
t: Add s
u
pport for importing commit notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
ha
n
Herland
Teach "-m <msg>" and
"
-F <file>
"
to "git notes edit
"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
J
ohan He
r
land
git
clone: Add --recursiv
e
to a
u
t
o
ma
t
ic
a
ll
y
checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
J
ohan Herlan
d
t7407: Use 'rev
-
parse --short
'
rather
t
han b
a
sh's
substring
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
erland
git submod
u
le
status:
Ad
d
--rec
u
rsive
t
o re
c
urse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git
s
ubmodule
upd
a
t
e: Introduce --recursive
t
o up
d
a
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herland
git subm
o
d
u
le
fo
r
each: Add --recurs
i
ve to recur
s
e into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
git submodu
l
e for
e
a
c
h:
t
est acce
s
s
to s
u
bmodule name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han
Herland
Add selftest for
'g
i
t submodule foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
git s
u
bm
o
dule: C
l
eanup usag
e
string and add op
t
ion
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Joha
n
H
erland
git submodul
e
foreach
:
Pr
o
vide access to
submod
u
le
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Johan H
e
rland
help
.
c
:
giv
e
correct struc
t
ure's s
i
ze to me
m
s
e
t(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Johan Her
l
an
d
q
u
ickfetch(): Prevent overflow of the re
v
-list command
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
J
ohan H
e
rland
git-submodul
e
: add
s
upport for
-
-m
e
rge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Jo
h
a
n Herland
Rename submod
u
le
.
<na
m
e
>
.
rebase
t
o submodule
.
<nam
e
>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
Update docs on
b
ehavio
u
r of 'core
.
sh
a
redRepository
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
J
ohan Her
l
and
Move chmod(f
o
o, 0444) i
n
t
o move_temp_to_file()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
Johan He
r
land
Use strchr
n
u
l() instead o
f
strc
h
r() plus manual w
o
rka
r
ound
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
Fix submodul
e
sync with relative submodule URLs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herl
a
nd
for
-
each-
r
e
f: Fix --f
o
r
m
at=%(subject) for log
m
ess
a
ge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
J
ohan
H
erland
Fi
x
Asc
i
iDoc errors in m
e
rg
e
d
ocumentation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-02
Johan
Her
l
and
Bring
l
o
cal clone's or
i
gin URL in
l
i
n
e
with tha
t
of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-08-21
Johan
H
erland
Teach "git
diff -p" HTML funcname patterns
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next