repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
log/pretty-options: Document --[no-]notes and deprecate old notes options
2011-03-30
Johan Herland
l
o
g/pretty-
o
ptions: Do
c
ume
n
t --[no-]notes a
n
d deprecat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checkout --track: E
n
s
ure th
a
t upstream br
a
n
c
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herland
push
.
default:
Re
n
ame
'
trac
k
ing' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
rl
a
n
d
Provi
d
e 'git mer
g
e
--
a
b
o
rt' as
a
s
ynony
m
t
o 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
cmd_merge():
Pa
r
s
e
options
before checking MERG
E
_
H
EAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erland
Provide 'git no
t
es
g
et-re
f
'
to easily
re
t
rie
v
e current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
rland
g
it notes m
e
rge
:
Add testcases fo
r
merging n
o
tes tree
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes
m
erge: Add anothe
r
auto-resolv
i
ng stra
t
egy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
g
it notes m
e
r
ge: --co
m
m
i
t
s
houl
d
f
a
i
l if
u
nderlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
notes merge: List c
o
n
flic
t
ing notes in n
o
tes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
gi
t
notes merge:
M
anu
a
l conflict res
o
lution, p
a
rt 2/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t no
t
es merge:
Manual confl
i
ct res
o
lution, pa
r
t 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docu
m
entati
o
n: Preliminary d
o
cs on 'git
not
e
s merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merge: Add automatic conflict reso
l
vers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git
notes
m
erge: H
a
ndle real, non-conflic
t
i
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c
: Refactor cre
a
tion of notes comm
i
ts
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git n
o
te
s
m
erge: Initial implementa
t
ion
h
andlin
g
trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
built
i
n/
n
otes
.
c
:
Split notes ref DWIMmery i
n
to
a sep
a
rate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: U
s
e two ne
w
l
i
nes (
i
n
s
tead of one)
when conca
t
enatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
(trivia
l
) t3303
:
Inden
t
w
i
th tab
s
instead o
f
spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
e
s
.
h/
c
: Propagate c
o
m
b
in
e
_notes_fn
r
etu
r
n
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
te
s
.
h
/
c: Allow c
o
m
b
ine_not
e
s
fu
n
ctions to r
e
move
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
c: Reor
d
er fun
c
tions in preparatio
n
for
n
e
x
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make default_notes_
r
ef()
a
vailabl
e
i
n
notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) n
o
tes
.
h: M
i
no
r
d
ocumentatio
n
fixes to c
o
py_no
t
es()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Her
l
and
notes
.
c: Hexify
S
HA1 in die()
m
e
s
sage from i
n
it_n
o
t
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n He
r
lan
d
notes: Don't create (empty)
c
ommit when removing
n
on
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
Ena
b
le custom schemes for
c
olumn
colors in the
graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herla
n
d
Mak
e
graph_
n
ext_l
i
n
e
() a
v
ailable in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revision: Turn off h
i
stor
y
simplifi
c
a
t
ion
i
n
-
-
ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
rev
i
sion:
Fix typo i
n
--ancestry-path error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erla
n
d
Documenta
t
ion
/
rev-
l
ist-options
.
txt: Explai
n
--ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
umenta
t
ion/rev-list-op
t
ions
.
txt: F
i
x missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herland
diff
.
c:
E
n
s
u
re
"
ind
e
x $from
.
.
$to" l
i
ne cont
a
in
s
unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-notes: Minor
(
mos
t
ly parse
_
options-
r
elated
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
subm
o
dule summary
:
D
o
n
't
b
a
rf when invoked in a
n
empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-no
t
es:
A
dd "copy" subcomman
d
for co
p
y
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
n
d
builtin-notes: Misc
.
r
e
fa
c
t
or
i
ng
o
f arg
c
a
nd exit val
u
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
b
u
il
t
in-notes: Add -c/-C options for
reusing
n
otes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Refactor
h
andling of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
builtin-
n
o
te
s
:
D
epreca
t
e the -
m
/-F
o
ption
s
for "
g
it
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-not
e
s: Add "append" subcommand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herl
a
nd
built
i
n-notes:
Add "add" su
b
com
m
and
for adding not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d --message/--file alias
e
s
for
-
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
built
i
n-notes: Add "list" subcommand for
listing not
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Documentation:
Ge
n
e
r
alize git-notes docs to
'
o
bjects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
ilt
i
n-notes: Add "prune"
s
u
bc
o
mmand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
e
s
API: prune_notes()
:
Prune not
e
s that b
e
long to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
t3305: Verif
y
that
r
emoving no
t
es triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
b
u
iltin
-
notes: Ad
d
"remo
v
e"
s
ubcomm
a
nd for rem
o
vin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Teac
h
builtin-note
s
to
remov
e
empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Teach notes code to properly p
r
e
serve non-no
t
es in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
nd
t3305: Veri
f
y
t
h
at adding many
not
e
s wit
h
gi
t
-n
o
te
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t330
1
:
Verif
y
su
c
cessful
a
nnotation
of non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
B
uiltin-
i
f
y gi
t
-
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
Refac
t
or
n
otes c
o
n
catenatio
n
i
n
to a flexible inte
r
face
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
No
t
es API: Allow multiple concur
r
e
n
t notes trees
w
ith
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herla
n
d
Notes
A
PI: write_notes_tree(): Store the not
e
s tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes
API
:
for_each
_
note(): Traverse the entire not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
an
d
No
t
es
A
P
I
: get_note(): Return
the
not
e
annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: rem
o
ve_note(): Remove note obj
e
ct
s
from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
AP
I
:
add_n
o
te(): Add note objects to the
i
nt
e
r
n
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes API:
in
i
t_note
s
(): Initialize t
h
e notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Add tests fo
r
c
h
e
cking correct handli
n
g of $GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API: g
e
t_commit_
n
otes()
-> fo
r
mat
_
note()
+
r
emove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Mino
r
c
o
smetic fixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan
H
erland
built
i
n-config
:
Fix crash when using "-f <relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n
H
erland
Add mo
r
e testcases t
o
t
e
st fast-import of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herland
Re
n
am
e
t9301 to t9350, to mak
e
room for more fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan H
e
rl
a
nd
fast
-
import: Proper notes
t
re
e
manipulat
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Her
l
a
n
d
Fix crasher on
encountering SHA1-li
k
e non-note in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic bu
i
ld
i
nfrastr
u
c
t
ure for Pytho
n
scrip
t
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han He
r
land
A
d
d sel
f
tests
verifyin
g
concatenat
i
o
n
of multiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Refactor notes code to conca
t
enate
multi
p
le notes annotating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herla
n
d
Add
self
t
ests verifying
t
h
at we can p
a
rse notes t
r
ees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach the notes lookup code to parse note
s
t
r
ees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
Herland
Teac
h
notes
c
ode to fre
e
its interna
l
data st
r
uctures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
Add flags to
g
et_
c
ommit_not
e
s
(
) to control the format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
t330
2
-notes-index-
e
xpensive:
Speed
u
p cr
e
ate_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rla
n
d
fast-import: Ad
d
suppor
t
for im
p
or
t
i
ng com
m
it notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
a
n Herl
a
nd
T
each
"-m <m
s
g>
"
and "
-
F <file
>
" to "
g
it n
o
tes edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Joh
a
n
H
e
rland
git
c
lone: Add
-
-
re
c
ursive
t
o
au
t
omatically checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t7407: Use 'rev-parse
--sho
r
t' rather than bas
h
's subs
t
ring
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herl
a
nd
git submodule sta
t
u
s: Add
--rec
u
rsive to recur
s
e into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
git submo
d
ule u
p
da
t
e: Introduce
--recursive to update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
git submodule foreach: Add --recur
s
ive to recurs
e
int
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
git submodule f
o
reach
:
test access to submodul
e
name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herland
Ad
d
selftest for 'gi
t
submodule
foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herland
git submo
d
ule:
Cleanup usage string a
n
d add o
p
tio
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
J
oha
n
Herla
n
d
git su
b
modu
l
e forea
c
h
:
P
r
ovide access
to submodul
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Joh
a
n
He
r
l
and
hel
p
.
c
:
give correct
structure's s
i
z
e
to
m
emset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Jo
h
an H
e
rland
q
u
ickfet
c
h(
)
:
P
revent
o
verflow of
t
he re
v
-list comman
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
g
i
t-s
u
bmodule: ad
d
s
u
p
p
or
t
for
-
-merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
J
o
han Herland
R
e
name su
b
module
.
<name>
.
rebase
to sub
m
odule
.
<
name>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Jo
h
an
H
erland
Update docs
on beh
a
v
iour of 'core
.
sh
a
redR
e
pository
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
Move chmod(foo,
0
444) into move_temp_to
_
file()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
J
o
h
an Herland
Use strchr
n
ul()
instead of strchr()
plu
s
manu
a
l workarou
n
d
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
J
oha
n
Herland
Fix submodule
sync wi
t
h relative submodule URLs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
f
or-each-re
f
: Fix --format=%(
s
ubject)
f
o
r
log
mes
s
age
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
J
ohan Her
l
and
Fix
Asc
i
iDo
c
errors in me
r
ge
documentati
o
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next