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
push.default: Rename 'tracking' to 'upstream'
2011-02-16
Jo
h
an Herland
push
.
d
efault: Rename 'track
i
ng' to 'upstream
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Prov
i
de 'git m
e
rge --
a
bo
r
t' as
a
synonym to 'git re
s
e
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Her
l
and
cmd_merge():
Parse
o
pti
o
n
s before
c
hecking
ME
R
GE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
Provide 'gi
t
not
e
s get-ref
'
to easily retri
e
ve cur
r
ent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
g
it notes
m
e
r
ge: Add test
c
ases for merging notes
t
rees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git
n
o
t
es merge: Add ano
t
her auto-re
s
olving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: --commit should fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merge: List confli
c
ting
notes i
n
n
o
t
es m
e
rge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes
merge: Manual conflict resolution, p
a
rt
2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes m
e
rge:
Manua
l
conflict resolu
t
ion, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
D
o
c
umenta
t
ion: Preliminary docs o
n
'gi
t
note
s
merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t no
t
es
m
e
rge: Add automatic conflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes merge: Handle real, non-conf
l
icting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Refactor creation of no
t
es comm
i
ts
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
g
i
t no
t
es merge: Initial implementation handli
n
g trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
builtin/notes
.
c: Split
notes r
e
f DWIMme
r
y int
o
a sepa
r
a
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rla
n
d
notes
.
c: Use two newlines (i
n
stead of one)
when
concaten
a
tin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(trivial) t3303:
I
ndent with tabs instead of
spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
notes
.
h/c
:
Propagate combi
n
e
_
n
otes
_
fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
h/c: Allow
c
o
m
bine_
n
o
t
es fun
c
tions to r
e
m
o
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an He
r
land
n
o
t
es
.
c:
Reorde
r
fun
c
tio
n
s
in p
r
eparatio
n
for n
e
xt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
note
s
.
h: Make de
f
ault_notes_ref() ava
i
lable in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h:
M
inor documentation fixes
to co
p
y_n
o
tes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
n
otes
.
c: H
e
xify
SHA1 in die
(
)
m
essage from ini
t
_n
o
tes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't cr
e
ate (empty) commit wh
e
n re
m
o
ving non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable
c
ustom schem
e
s for co
l
u
mn
colors
i
n the
graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Herland
Ma
k
e graph_next_line() av
a
ilable
i
n
th
e
gr
a
ph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
r
evisio
n
: Tu
r
n of
f
h
istory simp
l
ification in --
a
ncestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revisi
o
n: Fix typo in --ances
t
ry-path er
r
or message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
Documentation/re
v
-lis
t
-
o
p
tio
n
s
.
txt:
E
xplain
-
-
an
c
est
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
erla
n
d
Documentation/rev-list-o
p
tions
.
t
x
t
: Fix missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
rland
diff
.
c
: Ensure "index $from
.
.
$to" line contains unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han
H
e
r
lan
d
b
u
i
lt
i
n-notes:
M
i
n
o
r (
m
o
stly parse_op
t
ions-relat
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodu
l
e summary: Don'
t
bar
f
w
hen
invoked
i
n a
n
e
m
pty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-not
e
s: Add
"
copy" su
b
command
f
or copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Misc
.
refactoring of a
r
gc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
bui
l
ti
n
-notes: Add -c/-C options for reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
builtin-notes: Refactor handling of -
F
op
t
ion to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builti
n
-
n
otes:
Deprecate the -m/-F options for
"git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
bu
i
ltin-
n
otes:
A
d
d
"appen
d
"
subcomman
d
for appen
d
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
la
n
d
builtin-
n
ote
s
:
A
d
d "add" subcommand f
o
r adding not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
bu
i
ltin-note
s
: Add --mes
s
a
ge/--file a
l
iases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
a
n
d
builtin-notes: Add "list"
sub
c
om
m
and for listin
g
note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Documentatio
n
: Generalize git-note
s
docs to 'object
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builti
n
-no
t
es: Add "prune"
subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes
API
:
prune_notes(): Prune notes
that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3305: Verif
y
that removing notes tri
g
gers
a
ut
o
matic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin
-
notes: Add "remo
v
e
" subc
o
mmand for removin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
and
Te
a
ch builtin-note
s
to r
e
move empt
y
no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Teach notes code to
p
r
o
perly pr
e
s
e
rve non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t3305: Verify that adding many
notes with git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rl
a
nd
t3
3
01: Verify successful anno
t
at
i
on of
non-comm
i
ts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
H
e
rland
Builtin-ify git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
Refactor notes conc
a
tenation into a
f
lexi
b
le interf
a
c
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
Notes API: Allow mul
t
iple concurr
e
nt
not
e
s t
r
ees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: wri
t
e
_
n
o
tes_tr
e
e(): Store t
h
e no
t
es tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes A
P
I
:
for_each_note()
:
T
raverse
t
he en
t
ir
e
note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: get_note(): Return
t
he note annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
n
d
N
o
tes API:
remove_note(): Remove note objec
t
s fr
o
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Note
s
API: ad
d
_n
o
te(): Add
n
o
te objects
to t
h
e internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
Notes
A
P
I
: init_notes()
:
Initialize
the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Add tests for
c
he
c
k
ing correct handling of $GIT
_
NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
Not
e
s API:
g
et_commit_notes() -> for
m
at_note() + remov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
Minor
c
osm
e
t
i
c
fixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herla
n
d
b
u
i
l
tin-config
:
Fix crash w
h
en u
s
ing "-f <re
l
a
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
Herland
Add more testcases to
test
f
ast-import of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herla
n
d
R
en
a
me
t9301 t
o
t93
5
0, to
m
ake ro
o
m for more fas
t
-imp
o
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herlan
d
fast-
i
m
port: Pr
o
per notes tree mani
p
ula
t
ion
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan
H
e
r
land
F
i
x crasher on encounterin
g
SHA
1
-like
non-n
o
te in
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Her
l
and
Basic build
i
nfrastru
c
t
ure for Python s
c
r
i
pts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Add sel
f
test
s
verifyi
n
g
concat
e
na
t
ion
of m
u
ltiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refactor notes
c
ode to concatenate mu
l
t
i
ple
n
otes
ann
o
tatin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
Add se
l
f
t
ests verify
i
ng that we can parse notes tr
e
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an Herland
Teach the notes look
u
p code to parse notes t
r
ees wi
t
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Teach
n
ot
e
s cod
e
t
o free its i
n
ternal data str
u
ctures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add flags
to get
_
commit_not
e
s() to
c
ontrol
t
he
f
ormat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
t3302-notes-inde
x
-expensive: Spe
e
d up cre
a
te_repo(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
fast-i
m
p
ort: Add s
u
pport for importing commit note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach "
-
m <ms
g
>
"
a
nd "-F <file>" to "git note
s
edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan
Herland
git clone:
A
d
d
--recursive t
o
a
u
tomatically
checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
J
o
han Herland
t
7
40
7
: Use
'
rev
-
parse --sh
o
rt' r
a
ther than
b
ash's substring
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan He
r
land
git subm
o
dule stat
u
s:
Add --
r
e
c
u
rsive to recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan He
r
land
git submodule update: Intr
o
d
uce --
r
ecursive to upda
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
an Herland
g
i
t submodule fo
r
each:
Add -
-
rec
u
rsive to recurse in
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
git submod
u
le foreach:
test access to submodule name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
r
l
and
Add selfte
s
t for 'git s
u
bmo
d
ule foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git s
u
bmod
u
le: Cleanup usage str
i
ng and add op
t
ion
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Jo
h
an Herland
git submodul
e
foreac
h
: Provide acce
s
s
to
s
ubm
o
d
ule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
J
oh
a
n Herland
hel
p
.
c: give correct structure's size to
memset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Johan He
r
land
quickfe
t
ch(): P
r
event ov
e
r
flow of t
h
e rev-list comm
a
nd
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
git-subm
o
d
u
l
e: add support
f
or -
-
merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan
H
er
l
and
Ren
a
me s
u
bm
o
d
u
l
e
.
<n
a
me>
.
reba
s
e to submodule
.
<name>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Johan
H
er
l
and
U
pdate d
o
cs on be
h
av
i
ou
r
of 'core
.
s
haredRepository
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Joh
a
n
Herland
M
o
v
e
c
hmod(foo, 0444)
i
n
to move_temp_to_file(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
J
o
ha
n
Herland
Use
strchrn
u
l() instead of
strchr
(
) plus manual w
o
rkaround
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Johan H
e
rla
n
d
Fix submodule
s
ync with rel
a
tive su
b
module URL
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Jo
h
an
He
r
land
fo
r
-each
-
ref: Fix --format=%(
s
ubject) for log message
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
Joha
n
Herland
F
ix Asci
i
Do
c
error
s
in merge do
c
umentat
i
o
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-02
Johan Her
l
an
d
B
ring local clone's orig
i
n URL in line wi
t
h that
o
f
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-08-21
Johan
Herland
Teac
h
"git
dif
f
-
p
" HTM
L
funcnam
e
patterns
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next