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 'kk/maint-prefix-in-config-mak' into maint
2011-05-13
J
o
ha
n
Herland
t5400: Fix
a
couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Her
l
and
--dirsta
t
: In case of renames, u
s
e
target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --
d
irstat not t
o
co
m
p
letely ignore
rear
r
an
g
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herlan
d
--d
i
rstat-by
-
file: Make it faster and mor
e
co
r
rect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herla
n
d
--dirstat: Describe no
n
-
o
b
viou
s
dif
f
erences rel
a
t
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
bran
c
h
/c
h
ecko
u
t -
-
track: Ensure
t
h
a
t upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan He
r
land
push
.
default: Re
n
ame '
t
rack
i
ng'
t
o
'
upst
r
eam'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Pro
v
ide 'git
m
erge
--ab
o
rt' as a syn
o
nym to 'gi
t
r
e
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
cmd_merge(): Par
s
e options before checkin
g
MERGE_H
E
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Provide 'git no
t
e
s
get-ref' to easi
l
y retrieve
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s
m
e
r
g
e
: Ad
d
testca
s
es for me
r
gi
n
g n
o
tes
t
re
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: Add another auto-
r
esol
v
ing strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rla
n
d
git notes
m
e
rge:
-
-
c
omm
i
t should f
a
il
i
f underlyi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes
merge: List
c
o
n
flicting
n
o
t
es in note
s
m
e
rge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
g
i
t
no
t
es
me
r
ge: Man
u
al con
f
l
ict resolution, part 2/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git not
e
s
merge: Ma
n
ual c
o
nflict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Documentation: Preliminary d
o
cs
o
n
'
g
it no
t
es merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
g
i
t no
t
es merge:
A
dd automa
t
ic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git no
t
es merge:
H
andle real, non-c
o
nflic
t
i
ng note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/n
o
t
es
.
c: R
e
facto
r
creat
i
on of no
t
es
c
o
m
mit
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rland
g
i
t
n
otes merge: Initial implemen
t
ation h
a
nd
l
ing
t
r
ivia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herla
n
d
builtin/notes
.
c: Split not
e
s
ref DWIMm
e
ry into a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
notes
.
c
:
U
se
t
wo newlines (instea
d
of one) when
c
oncate
n
a
tin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
(
t
rivial) t3303: Indent wit
h
tabs
i
n
stead o
f
s
paces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
notes
.
h/c: Propagate combine_
n
otes_
f
n
r
eturn va
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/
c
:
A
llo
w
combine
_
n
otes functions
t
o remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herland
notes
.
c: Reorder functions
i
n
prepa
r
a
t
ion for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
h
: Make default
_
notes_
r
ef() availab
l
e in no
t
es API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
(trivial) no
t
e
s
.
h:
M
inor documentati
o
n
f
i
xe
s
to co
p
y_
n
ot
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
c: Hexify SHA1 in die() mess
a
ge from i
n
it_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
Herl
a
nd
not
e
s: Don't cr
e
ate (e
m
pty) commit when re
m
ov
i
ng
no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
E
n
able cu
s
tom sch
e
mes fo
r
colum
n
colors in the gr
a
ph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herland
Ma
k
e
gra
p
h_next
_
l
ine() available i
n
the
g
raph
.
h
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n
He
r
l
and
revis
i
o
n
:
Turn o
f
f
history simplific
a
tion
in
--an
c
estr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision:
Fix typo in --an
c
e
s
t
r
y
-pat
h
error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herl
a
nd
D
ocumentat
i
o
n/re
v
-list-
o
ptions
.
t
x
t: Explain --
a
ncestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
Documen
t
ati
o
n/
r
ev-l
i
st-options
.
tx
t
: F
i
x missing
l
ine
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
han
H
erland
d
iff
.
c: Ensure "inde
x
$from
.
.
$t
o
"
l
i
n
e contains unam
b
ig
u
ous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-notes
:
Minor (mostly parse_options
-
relat
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herla
n
d
submodule
s
ummary
:
Don't barf when invoked in
an empt
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd "copy
"
subcommand for copying n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Mi
s
c
.
refactoring of
a
rgc and exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
bu
i
ltin-no
t
es: Add
-c/-C opt
i
ons for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Refactor handling
o
f -F op
t
ion to a
l
low
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an H
e
rlan
d
builtin-notes: D
e
precate
t
he -m/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
b
u
iltin-notes: A
d
d
"append" subcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
H
e
rland
builtin-notes
:
Add "add" subcomman
d
for ad
d
i
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
bu
i
l
t
in-
n
ot
e
s: Add --message/--fi
l
e
aliase
s
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-
n
otes: Add
"list"
subcomma
n
d for
l
ist
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Docu
m
entation: Generalize
git-not
e
s docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-
n
otes: Add "prune" s
u
bc
o
m
m
a
nd for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: prune
_
n
o
tes()
:
Prun
e
notes
t
hat bel
o
ng
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
t33
0
5: Ve
r
if
y
that removing not
e
s t
r
iggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
b
uil
t
in-n
o
tes
:
Add "remove"
subcommand for removi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
Teach b
u
i
lt
i
n-no
t
es to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Teach notes code
t
o
p
ro
p
erly p
r
ese
r
ve n
o
n-n
o
t
e
s
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t3305: Verify that ad
d
ing m
a
ny n
o
tes with g
i
t
-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
t33
0
1:
V
eri
f
y s
u
cces
s
ful an
n
otation of non
-
c
o
mmits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Buil
t
i
n
-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
R
e
facto
r
notes
co
n
catenation into a flexible inter
f
ace
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: Allow m
u
ltip
l
e
concurrent n
o
t
e
s trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: write_not
e
s_tree(): Stor
e
the
n
otes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API
:
fo
r
_each
_
note(): Trave
r
se the entire not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herla
n
d
No
t
es API: get_note(
)
: Return the not
e
annotating
t
he
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
nd
Notes API: r
e
mov
e
_n
o
t
e
():
Remove note
objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: add_no
t
e
(
): Add
n
ote objects to
t
he interna
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herla
n
d
Not
e
s API: ini
t
_notes(): Initialize the
n
o
t
es tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Add
tes
t
s
for checking correct
hand
l
ing of $GIT_NOTES_R
E
F
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI: get_com
m
it_notes() ->
f
o
r
m
at
_
note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
n
d
Minor cosmetic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herla
n
d
builtin-config:
Fix cr
a
sh when
u
sing "-f <rela
t
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add
m
ore testcases to test
f
ast-impo
r
t
of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 t
o
t
9
350, to
m
ake room for more fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast
-
import: Pro
p
e
r
notes tree manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
o
h
an H
e
rland
Fix cra
s
he
r
o
n encountering SHA
1
-like non-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic build infrastructure for Py
t
hon
s
cripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Add
s
elftes
t
s verifying c
o
ncatenation of m
u
l
t
iple no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
r
l
a
n
d
Refactor notes c
o
de
to concat
e
nate mul
t
iple notes annota
t
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Add s
e
lftests ver
i
f
ying t
h
at w
e
c
a
n parse notes
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Teac
h
the
notes
lookup c
o
d
e
to parse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
Teac
h
n
o
tes code
t
o f
r
ee its
i
nte
r
nal data struc
t
ures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Add
flags to get_commit_notes() to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
t3302-notes
-
index-expen
s
ive
:
Sp
e
ed
up
create_rep
o
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
r
land
fast-import: Add sup
p
ort for im
p
or
t
ing com
m
it not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
T
each "-m <msg>" and
"
-F <fil
e
>"
t
o "git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Her
l
and
git clone: Add --recursive to automa
t
ically che
c
kout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Joh
a
n Herland
t7407: Use 'rev-parse --sho
r
t'
r
ather than bash's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han
H
er
l
and
git submodule status: Ad
d
-
-
recursive to
recur
s
e
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
and
git submo
d
ule update: Introduce
-
-recursive to updat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han
H
erla
n
d
git submodule
f
oreach: Add
--recursive to r
e
cur
s
e into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git subm
o
du
l
e foreac
h
: tes
t
access to
submo
d
ule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
A
dd selfte
s
t
f
or '
g
it submodul
e
fo
r
each'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
g
i
t s
u
bmodule: Cleanup usage str
i
n
g
an
d
ad
d
option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Joh
a
n Herl
a
nd
g
it
s
u
bmod
u
le foreach
:
Provide access to
s
u
b
module
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
J
o
h
an H
e
rland
help
.
c: give c
o
rrect structure's size t
o
me
m
set()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan H
e
rland
quickfetch():
Preve
n
t
overflow
o
f the rev-list command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
ha
n
He
r
land
git-submodule: add supp
o
rt for --merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Rename submod
u
le
.
<name>
.
rebase to
s
ubmo
d
u
l
e
.
<
n
ame>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herla
n
d
Upd
a
t
e
d
ocs on
b
e
havi
o
ur of 'core
.
s
h
aredRepository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan
Herlan
d
Move
c
h
m
od(foo, 0444
)
i
nto
m
o
ve_temp_to_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next