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
Make "git notes add" more user-friendly when there are existing notes
2011-03-30
Johan Herla
n
d
Make "git notes add" more u
s
er-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herla
n
d
branch/chec
k
out --track: Ens
u
re t
h
a
t
upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default:
R
e
name 'tracking'
t
o '
u
pstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Her
l
and
P
r
ovid
e
'git merge --abo
r
t' a
s
a syno
n
y
m
to 'gi
t
reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herlan
d
cmd_merge(): Parse options bef
o
re check
i
ng MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provid
e
'git notes get-ref
'
to easily
r
etriev
e
c
u
rrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes
m
e
rge
:
Add testcases for merging notes tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git n
o
te
s
merge: Add anot
h
er auto-r
e
solving st
r
a
tegy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes merge: --commit should fail
i
f
u
n
d
e
rlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herl
a
nd
g
it not
e
s mer
g
e: List conflicti
n
g note
s
in notes me
r
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
n
otes merg
e
: Manual conflict r
e
solution, part 2/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
gi
t
n
o
t
es merge:
M
anual
conflict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Do
c
umen
t
ation: Prelimi
n
a
r
y
d
ocs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes m
e
rge:
A
dd au
t
omatic c
o
nflict resolv
e
rs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erland
g
it
notes
merge:
Handl
e
real, non-conflict
i
ng not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
an
d
builtin/notes
.
c: Refa
c
t
or
creation of notes
commit
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
g
it notes merge:
Initial
i
mp
l
ementation handling
t
rivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
builtin/no
t
es
.
c:
Split notes r
e
f
D
WIMmery into a
s
ep
a
rate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
not
e
s
.
c: Use two
newlines (instead
o
f on
e
) when conc
a
t
e
natin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
(trivial) t
3
3
0
3
: Inden
t
with ta
b
s instea
d
of
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
notes
.
h/c: Propagate combine_no
t
es_fn re
t
urn
v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
h/c: Allow combine
_
notes functi
o
ns to
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c:
R
eorder functions in preparat
i
on f
o
r next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
oh
a
n
Her
l
and
n
o
tes
.
h: Make default_note
s
_
r
ef() available in n
o
t
e
s API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
(trivial
)
notes
.
h: Mi
n
o
r
documentati
o
n fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herla
n
d
n
o
tes
.
c: He
x
ify SHA1 i
n
die() messag
e
fr
o
m init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
no
t
es: Don't crea
t
e
(
empty) co
m
mit w
h
en remo
v
i
ng
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custom s
c
hemes for column
c
o
lors in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
n
d
M
a
ke
gr
a
ph_n
e
x
t_line(
)
avail
a
ble in t
h
e g
r
aph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
revision
:
Turn off
h
ist
o
ry si
m
p
l
i
f
icat
i
on
i
n
--an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
an Herl
a
nd
revision: Fix
t
ypo
i
n --ancestr
y
-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/r
e
v-list-opti
o
ns
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
Doc
u
mentation
/
rev-
l
ist-options
.
txt: Fix m
i
ssing
l
i
ne
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
han He
r
land
diff
.
c: Ensur
e
"index $
f
rom
.
.
$to" l
i
n
e
cont
a
ins unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan H
e
r
l
and
built
i
n-notes
:
Minor
(
mostl
y
pa
r
se_options-
r
elated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han Herland
subm
o
dule
summary: Don't
barf whe
n
invoke
d
i
n an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes: Add "cop
y
" sub
c
ommand f
o
r copyi
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
b
u
ilt
i
n-notes: Misc
.
refac
t
oring of argc and exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
builti
n
-
notes: Add -c/-C options fo
r
reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
b
uiltin-notes
:
Refact
o
r
h
andling
of
-F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
l
and
built
i
n
-
notes: Deprecate t
h
e
-
m
/-F opt
i
o
n
s for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
b
uiltin-n
o
tes: Add "app
e
nd" subcomman
d
for appendin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add
"
ad
d
" subcommand for add
i
ng no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin
-
notes: Add --messag
e
/--
f
ile aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd "list"
subco
m
mand fo
r
listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Documentation
:
Generaliz
e
git-
n
otes doc
s
t
o
'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
ui
l
tin-no
t
es: Add
"
p
r
une" subcommand for r
e
m
o
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
N
o
t
e
s API:
p
rune_notes(): Prune notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t330
5
: Verif
y
th
a
t removing notes triggers au
t
o
matic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
a
n
d
b
ui
l
t
i
n-notes
:
Add "rem
o
ve"
s
ubcommand for
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Tea
c
h buil
t
in-
n
ote
s
to remo
v
e empt
y
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Te
a
ch notes code to p
r
operly
p
reserve non-note
s
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
t330
5
: Veri
f
y
that
a
dding many
no
t
es
w
i
th gi
t
-
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t3301:
V
eri
f
y successful
a
nno
t
ation of non
-
co
m
mits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Built
i
n-ify g
i
t-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor notes concatenation in
t
o a f
l
exi
b
le interf
a
ce
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
No
t
es A
P
I: Allow multiple concurren
t
notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
No
t
e
s API: wr
i
t
e_note
s
_tree(): Store the
n
otes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes API:
f
o
r_each
_
note(): Travers
e
the e
n
tire
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
Notes
API: get_note()
:
Return the note a
n
no
t
ating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
Notes API: remove
_
note(): Remove note o
b
je
c
ts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API: add_note(): Add not
e
objects to the int
e
r
nal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: i
n
it_notes(): Initialize the no
t
es tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Add te
s
ts fo
r
checking corre
c
t ha
n
dling
of
$GIT_NO
T
ES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
get_
c
ommit
_
notes() -> f
o
r
m
a
t
_
n
o
t
e() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Minor
c
osm
e
ti
c
fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
ohan Herland
builtin-c
o
nfig: Fix crash
w
hen
u
sing
"
-f <rela
t
ive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
Add more te
s
tcases to test fast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erl
a
nd
Re
n
a
m
e
t9301 to
t9350, to ma
k
e
room for mor
e
f
ast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan He
r
l
and
fast-impor
t
:
Proper
no
t
e
s
tree manipu
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan
Herland
Fix crasher
on encounter
i
ng SHA1-like n
o
n
-
note
i
n notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
J
o
han
H
erland
Basic buil
d
infrastructu
r
e for
P
y
thon scri
p
ts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d se
l
ft
e
sts ver
i
fyi
n
g concatenation of
m
ul
t
iple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
R
efa
c
tor note
s
code
t
o conc
a
tenate multiple notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
Ad
d
selftes
t
s verifying that we ca
n
parse n
o
tes tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
He
r
land
T
e
ach the notes lookup code to pars
e
notes
t
r
e
es with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herlan
d
Te
a
ch notes c
o
de to
f
ree its
i
nt
e
r
n
al
dat
a
stru
c
tures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add flag
s
to get_com
m
it_notes() to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
t3302-no
t
es-index-expen
s
ive:
S
peed up create_rep
o
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
oh
a
n Herland
fast-im
p
ort:
A
dd
s
upport for im
p
orting co
m
mit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach "-m <msg>" and "-F <file>"
t
o
"g
i
t notes e
d
it"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herlan
d
git clone
:
Ad
d
--r
e
cursive to auto
m
atically checko
u
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t
7
407: Use 're
v
-pa
r
se --short'
rathe
r
than bash's s
u
bstring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git submodule status: Add --r
e
cursive
t
o
r
ecu
r
se i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n Herla
n
d
g
it submodule u
p
dat
e
: Introduce
-
-
r
e
cur
s
i
v
e
to up
d
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodul
e
fo
r
e
ach: Add
--recursi
v
e to recurs
e
i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
git s
u
bmodule f
o
reach:
t
e
s
t acces
s
t
o submodu
l
e name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herland
Ad
d
selftest for 'git submodul
e
f
o
r
each'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herland
git
submodule: Cleanup
u
sage
strin
g
and add opti
o
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herlan
d
git subm
o
dule f
o
r
e
ach: Provide access to submodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan Herland
help
.
c: give correct
structure'
s
size to mems
e
t()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Her
l
and
quickfetch(): Prevent overflow o
f
t
h
e rev-list com
m
a
n
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan
H
erl
a
nd
git-submo
d
ule: add support for --mer
g
e
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
ha
n
Herland
Rename subm
o
dule
.
<name>
.
rebase
t
o submodule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Jo
h
an
H
erland
Up
d
ate docs on behav
i
o
ur
o
f 'core
.
sh
a
r
e
dRe
p
os
i
tory
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Joha
n
Herland
Move chmod(
f
oo, 04
4
4) int
o
move_te
m
p_to_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Joh
a
n
Herland
Use strchrnul
(
) instead of strchr() plus manual worka
r
o
und
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herl
a
n
d
Fix subm
o
d
ule
s
y
n
c with
relative submodule URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan
Her
l
and
for-e
a
ch-ref: Fix --forma
t
=%(subje
c
t
)
for log messag
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
J
o
han H
e
r
l
a
nd
Fix
A
s
c
iiDo
c
errors in merge do
c
ume
n
tat
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next