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
Make "git notes add" more user-friendly when there are existing notes
2011-03-30
J
o
han Herland
Ma
k
e
"git
n
o
t
e
s
a
dd" more user-f
r
iendly
when th
e
r
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
br
a
nch/check
o
ut --track:
E
nsure th
a
t upstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n Herland
push
.
def
a
ult: Rename 'tracking' t
o
'u
p
stream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge -
-
a
bor
t
' as a sy
n
onym to 'gi
t
reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
c
m
d_merge
(
): Parse options
b
efore
c
heckin
g
MERGE
_
HEA
D
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Pr
o
vide 'git notes get-ref' to easi
l
y retr
i
eve c
u
rrent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
g
it note
s
m
e
rg
e
: A
d
d test
c
a
ses for merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merge
:
Add
a
nother auto-re
s
olving strate
g
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herla
n
d
git n
o
tes merge: --
c
ommit sh
o
uld fa
i
l if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
git
n
otes
mer
g
e
:
List conflicting
n
otes in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git
n
otes merg
e
:
Manua
l
conflict r
e
solution, p
a
rt
2
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge:
M
anual conflict re
s
olution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Documentation:
P
re
l
imin
a
ry docs on 'git
n
o
t
es merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add
a
utomatic conf
l
ict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herl
a
nd
git notes merge:
H
andle real, non-
c
onflicti
n
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bu
i
l
t
in
/
not
e
s
.
c: Refact
o
r c
r
eation of n
o
tes commit
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge: In
i
ti
a
l
i
mplementation hand
l
ing triv
i
al
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
b
u
iltin/notes
.
c: Spl
i
t note
s
ref DWI
M
mery
into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
tes
.
c: Use two new
l
in
e
s (instead of one) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
nd
(tr
i
vial) t3303: Indent with tabs inste
a
d
of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rlan
d
notes
.
h/c: Propagate combine_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
h/c:
Allow combine_
n
otes functions to
r
emove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an Her
l
a
n
d
notes
.
c: Reorder functions in preparati
o
n f
o
r ne
x
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make default_notes_ref() availa
b
le in notes AP
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
e
rland
(trivi
a
l) notes
.
h: Minor documenta
t
ion f
i
x
es t
o
co
p
y
_
no
t
es()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c: Hexify SHA1 in d
i
e
(
) message
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 w
h
en re
m
oving non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enab
l
e custom schemes
for c
o
l
umn col
o
r
s
in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_
n
ext_li
n
e() available in the
g
raph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
oha
n
Herland
revision
:
Turn off history simplification in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an He
r
land
revi
s
ion: F
i
x typo in -
-
a
n
cestry-path
e
r
ror
m
essage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Documentation/rev-
l
ist-options
.
txt: E
x
pl
a
in --anc
e
str
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an H
e
rland
D
o
cum
e
n
t
a
t
ion/rev-list-o
p
t
ions
.
txt: Fix missin
g
line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c
:
Ensure "i
n
dex $from
.
.
$to" l
i
ne
c
o
n
ta
i
ns unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
buil
t
in-notes: Mino
r
(mostly p
a
r
se_op
t
i
o
ns
-
related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han
Herland
s
ub
m
odule summary: Don't barf when i
n
voked in an
em
p
ty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
built
i
n-notes: Add "copy" subcommand for
copyin
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
builtin-
n
o
t
es: Mi
s
c
.
refactorin
g
of ar
g
c
and exit
value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-
n
otes:
Add
-c/-C
o
ptions for reusin
g
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
b
uiltin
-
not
e
s:
Refactor handl
i
ng of
-
F
option to allo
w
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
n
d
builtin-notes: Depreca
t
e the -m/
-
F options for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s: Add "append"
s
ubcommand
for a
p
pending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herla
n
d
bu
i
ltin-notes
:
Add "add" subcom
m
and for ad
d
i
ng
n
o
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
builtin-not
e
s:
A
d
d
--message/--file aliases
for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Add "list"
s
u
b
c
ommand f
o
r listing not
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Documentation: Generalize git-notes docs to
'obj
e
cts
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-n
o
tes: Add "prune" subcomman
d
for r
e
moving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API:
p
r
une_notes(): Prune
n
o
t
es
tha
t
belong
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
t33
0
5:
V
e
r
i
fy that re
m
oving notes triggers aut
o
m
atic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-no
t
es: Add "remove
"
s
u
bcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Tea
c
h builtin-notes to
r
emo
v
e
e
mpty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Teach notes code to
properly preserve non-notes
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
0
5: Verif
y
that adding many note
s
with
g
it-not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verif
y
successful annotation o
f
non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
lan
d
B
u
ilt
i
n-ify git
-
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
R
e
factor
n
o
tes concatenation int
o
a
flexible
inte
r
face
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
N
o
tes A
P
I
: Allow multiple concurrent n
o
tes tre
e
s w
i
t
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API:
w
rite
_
notes_tree(): St
o
re the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes
AP
I
: for_each_n
o
t
e(): Traverse the enti
r
e n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API:
g
et_no
t
e
(): Return the note
annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
N
otes
A
PI: re
m
ove_note(): R
e
move n
o
t
e
objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
No
t
es A
P
I: add
_
not
e
(): Ad
d
not
e
objects to th
e
inte
r
nal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes
API:
init_notes(): In
i
tializ
e
the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Add
te
s
ts for checking co
r
rect handling of $GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n He
r
land
Notes API: ge
t
_commit_notes() -> form
a
t_note() + remo
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Min
o
r cosmetic fixes to
n
o
t
es
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
J
ohan Herla
n
d
b
uilti
n
-config
:
Fix
crash when using "
-
f <rel
a
t
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n
H
er
l
and
A
dd
more
t
estcases
t
o test fast-imp
o
rt
o
f note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han He
r
land
R
ename t9301 t
o
t
9
3
50, to make room
for
more fast
-
i
m
por
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-import: Proper notes tree ma
n
ipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix crashe
r
on encou
n
tering
SHA1-like n
o
n-note in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan He
r
l
a
n
d
Ba
s
ic build infrastructure
for
P
ython scr
i
pts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an Herland
Add selftests verify
i
n
g
concatenation o
f
multiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Her
l
and
Refactor notes cod
e
t
o
concatenate multiple
no
t
es an
n
ota
t
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
A
dd selftests v
e
rifying that we can
p
arse notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Teach
the note
s
loo
k
up code to parse
notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach notes code to free i
t
s
i
ntern
a
l
d
at
a
str
u
ctur
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rl
a
nd
Add fla
g
s
t
o get_commit_
n
otes()
t
o
c
on
t
rol the f
o
rma
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
t3302-notes-in
d
ex-
e
xpensive: Speed up create_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
fast-import: Add support for importin
g
commit notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
T
e
a
ch "-m <msg>" and "-F <file
>
"
to "git notes edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan H
e
r
l
a
nd
git clone: Add --
r
ecursi
v
e to automa
t
ica
l
ly checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
J
ohan Herla
n
d
t7
4
0
7: Use 'rev-parse --sh
o
rt' rather than bash's subst
r
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herland
gi
t
s
ubmodul
e
status: Add --r
e
c
u
rsive to r
e
curse in
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule u
p
date: I
n
tro
d
uce --recursive to
u
pdat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule foreach: A
d
d
--recursive to recurse
i
nto
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule foreach: test access t
o
su
b
modu
l
e name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan
H
erland
Add selftest for 'g
i
t su
b
module foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n
H
erland
git submodul
e
: C
l
eanup usage stri
n
g a
n
d a
d
d option
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Johan
H
erla
n
d
git submodule foreach: Provide access to submodule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Johan H
e
rland
help
.
c:
g
iv
e
correc
t
structu
r
e's size
t
o m
e
mse
t
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Johan
H
erla
n
d
q
u
i
c
kfetc
h
():
P
re
v
ent o
v
e
r
flow of the
r
ev-list
comma
n
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan
Herla
n
d
git-submo
d
ule
:
add
sup
p
ort for
-
-m
e
r
g
e
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan
H
erland
Rename submod
u
l
e
.
<na
m
e>
.
r
e
base to submodule
.
<name>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Joh
a
n
Her
l
and
Up
d
ate docs
o
n behaviour of 'c
o
re
.
shar
e
d
R
ep
o
sitory
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Johan
H
erland
Move chmod(
f
oo, 0444) into mo
v
e
_
tem
p
_to_file()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herla
n
d
Use strch
r
nul() instead of strchr
(
)
plus manual
w
or
k
a
round
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
J
ohan Her
l
and
Fi
x
submodule s
y
nc
w
it
h
relative
s
ub
m
odule
U
RL
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
f
o
r-each-ref: Fix --format=%(subje
c
t) f
o
r log
message
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
Johan Her
l
and
Fix AsciiDo
c
er
r
ors i
n
merge d
o
cumentation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next