repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2011-02-16
Johan Herland
push
.
default: Rename 'track
i
ng'
t
o 'upst
r
eam'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge -
-
abort'
a
s a synonym
to 'git res
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
cmd_merge(): Parse opti
o
ns b
e
f
ore c
h
e
c
king MERG
E
_
H
E
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herland
Prov
i
de '
g
i
t
n
otes get
-
ref'
to
e
a
sily retrieve
c
u
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git n
o
tes me
r
ge
:
Add te
s
tcases for me
r
gin
g
notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git n
o
tes merg
e
: Add another
a
u
to-resolving strateg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
git notes merge: --commit sh
o
uld fa
i
l
i
f unde
r
lying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
gi
t
notes mer
g
e: List conflic
t
ing notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Her
l
and
gi
t
notes merge: Manu
a
l con
f
l
ict
r
eso
l
ution, part
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git note
s
me
r
g
e
:
Manual conflict
res
o
lut
i
on, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
D
ocumentation: Preliminar
y
docs on
'
git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git
notes
m
erge: Ad
d
automatic conflict res
o
lvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes merge:
Ha
n
dle real, non-con
f
li
c
t
ing
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herla
n
d
builtin/n
o
tes
.
c: Ref
a
ctor cr
e
ation of notes c
o
m
m
its
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
git
n
otes merg
e
: Initial imple
m
ent
a
t
ion
han
d
l
i
n
g trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
b
uiltin/
n
otes
.
c: Sp
l
it notes ref DWIMmery
into
a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
n
otes
.
c: Use two newlines
(
inst
e
ad o
f
one) when
c
o
n
c
atenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(
t
r
ivi
a
l) t3303: Indent
w
i
t
h t
a
b
s
i
nst
e
ad of space
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
notes
.
h
/
c
: Propa
g
ate combine_notes_fn
return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herla
n
d
notes
.
h/c: Allow combine
_
n
o
t
es function
s
to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
not
e
s
.
c: Reorder funct
i
o
n
s in prepa
r
ati
o
n
f
o
r
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make default_notes_r
e
f() available in notes
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
(trivial) notes
.
h:
Mino
r
documentation fixes t
o
copy_n
o
tes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c
:
Hexify SHA1
in die()
m
essage
from
i
n
it
_
note
s
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan Herland
no
t
es: Don't create
(empty) com
m
it when re
m
oving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
Enabl
e
c
u
stom schemes for column colors in the
g
raph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
M
a
ke g
r
aph_n
e
x
t
_
line() availab
l
e
i
n the g
r
aph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herl
a
nd
r
e
visi
o
n: Turn off hi
s
t
ory
s
implif
i
cat
i
o
n in --ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
rev
i
si
o
n: Fi
x
t
ypo in --an
c
estry
-
path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/
r
ev-list
-
o
p
t
i
ons
.
txt: Explain --an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han H
e
rland
Documentati
o
n/rev-lis
t
-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan He
r
l
and
diff
.
c
: Ens
u
re "index
$
from
.
.
$to" l
i
n
e
con
t
ains
unambi
g
uous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Joha
n
Herland
bui
l
t
in-no
t
es:
M
inor (mostly par
s
e
_
options
-
relate
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herlan
d
submodule summary: Don'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 He
r
l
and
builti
n
-not
e
s:
A
dd "
c
opy
"
s
ubcomma
n
d fo
r
copying note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
built
i
n-not
e
s: Misc
.
refac
t
oring of argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uil
t
in-notes: Add -c/-C options f
o
r reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
bu
i
lt
i
n
-
notes: Re
f
act
o
r ha
n
dling o
f
-F option
t
o
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes
:
De
p
recate
t
he -
m
/-F options f
o
r "
g
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
built
i
n-
n
otes:
Add "append" subcommand for appe
n
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
builtin-note
s
:
Add "add" subcommand for addi
n
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-no
t
es:
A
dd --message/--file
aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
builti
n
-notes: Ad
d
"
list" subc
o
m
m
and
for listin
g
note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
Documentation: Genera
l
iz
e
git-
n
otes doc
s
to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
l
a
n
d
b
u
i
ltin-notes: Add "prune"
subcommand for rem
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: prune_notes(): Prune no
t
e
s that
belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
330
5
: Ve
r
i
f
y that re
m
oving no
t
es
t
riggers autom
a
tic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
bu
i
ltin-no
t
e
s
: Add "remove" subcomman
d
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
T
each builtin-notes to re
m
ove
e
m
pty n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Teach
n
ot
e
s code to properly
p
r
e
s
e
rve non-note
s
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Her
l
and
t3305: Veri
f
y that adding
m
any notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t3301: Verify successful annota
t
ion of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
e
rland
Bu
i
ltin-if
y
gi
t
-
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Refacto
r
note
s
con
c
atenat
i
on i
n
to a fle
x
ible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
:
Allow
multiple concurrent notes
t
re
e
s wi
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Note
s
API: write_notes_tree(): Stor
e
t
h
e no
t
e
s tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Not
e
s AP
I
: for_each_note(
)
: Trave
r
se t
h
e entire not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es API: get_note()
:
Retu
r
n t
h
e
n
o
te a
n
not
a
ting the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
r
emove_note(): Remove note
o
bjects
f
r
o
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
Notes AP
I
: add_
n
ot
e
(
)
:
Ad
d
note
objects t
o
the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Not
e
s
API:
i
nit_no
t
e
s(): Initialize the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Add tests for checkin
g
correct handling of $GIT_NOTE
S
_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: get_commit_notes() -> format_note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Minor cosmetic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joh
a
n Her
l
and
bu
i
lti
n
-config: Fix crash when using "-f <re
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an
H
erlan
d
Add
more tes
t
cas
e
s to
t
est fast-import of n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rena
m
e t9301 to t9350, to
make room fo
r
mor
e
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herl
a
nd
fas
t
-import: Prop
e
r
notes tree manipu
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
o
han Herl
a
nd
Fix crasher
o
n
encoun
t
er
i
n
g
S
H
A
1
-like n
o
n-note in note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herl
a
nd
Bas
i
c b
u
ild infra
s
t
ruc
t
ure f
o
r Python sc
r
ipts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
a
n Herl
a
nd
A
d
d selftests verify
i
ng
conca
t
enation of multiple
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
R
e
factor notes code to concat
e
nate m
u
lt
i
ple not
e
s an
n
ota
t
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han H
e
rland
Add
sel
f
tests verifying that we can parse notes
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Teach
th
e
n
otes loo
k
up cod
e
to parse not
e
s
t
rees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
a
n
d
Tea
c
h notes c
o
d
e to free its in
t
ernal data
st
r
uctures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
A
dd flags to get_commit_notes() to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t
3
30
2
-n
o
tes-index-ex
p
en
s
ive
:
Speed
up
create_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
erland
fast-imp
o
rt: Add support for impor
t
ing commit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Her
l
a
n
d
Teac
h
"
-
m <msg>" and "-F <
f
ile>"
to "git notes
e
dit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan H
e
rl
a
nd
git clone: Add
--
r
e
c
u
r
si
v
e to
automatic
a
l
l
y checkou
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t
7
407: Use 'rev
-
pa
r
se
-
-short' rather than ba
s
h's s
u
bstring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herland
git submodu
l
e statu
s
: Add -
-
r
ecursive t
o
recurse int
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
erland
g
i
t submodul
e
up
d
a
t
e
:
Introdu
c
e -
-
recursi
v
e to updat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodul
e
foreach: Add --recursive to rec
u
rs
e
in
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n
Herland
git submodule foreach
:
t
est access to submodule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
Add self
t
est for 'git submod
u
le foreach
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan He
r
land
git s
u
bmodule: Cle
a
nup usag
e
str
i
ng and add option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herland
git submodule foreach: Provide
a
ccess
t
o
s
u
b
m
odul
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
J
ohan Herl
a
nd
help
.
c: give correct structure's siz
e
to memset
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan H
e
rland
qui
c
kfetch(): Preven
t
ov
e
rflow of the re
v
-list command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
g
i
t-submod
u
le:
a
dd
suppo
r
t
for --merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Rename submodul
e
.
<name>
.
reba
s
e to submodule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Joha
n
Herland
Upd
a
te doc
s
on behaviou
r
o
f 'core
.
shar
e
dRepository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Joh
a
n
H
erland
Move chmod(foo, 0444)
i
n
t
o move
_
temp_to_fi
l
e()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herla
n
d
Use
str
c
hrnul() inste
a
d of st
r
chr() plus manual wo
r
k
around
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
J
ohan Herla
n
d
Fi
x
su
b
modu
l
e s
y
n
c
with relat
i
ve su
b
m
o
dule
U
RLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan He
r
land
for-eac
h
-r
e
f
:
F
i
x
--format
=
%(subject) for
log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan Herland
Fix
A
sciiDoc errors in merge document
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Johan Her
l
and
Bring loc
a
l clo
n
e's origin URL in l
i
ne with
that of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
J
o
han
H
erl
a
nd
Teach "
g
it di
f
f -p" HTML
funcname pa
t
terns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next