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 'jm/mergetool-submodules' into maint
2011-05-13
Johan Herland
t5400: Fix a cou
p
l
e of
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan
H
erla
n
d
--dirstat: In ca
s
e
o
f r
e
names, use ta
r
get filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
Teach
--dirst
a
t n
o
t to completely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
-
-dirstat
-
by-file: M
a
ke it fa
s
ter and
mo
r
e correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat:
D
escri
b
e non-o
b
v
ious
d
ifferenc
e
s relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an
Herland
branch/checko
u
t --tr
a
ck:
Ensure tha
t
ups
t
ream br
a
nch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Her
l
a
n
d
p
u
sh
.
default: Rena
m
e 'tracking' to
'u
p
stream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Provide
'
g
i
t merge --abor
t
'
a
s
a synonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
c
md_merge(): Parse option
s
b
efore che
c
king M
E
RGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide
'
gi
t
notes get-ref' to
e
asily retrieve curren
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herlan
d
git
n
o
tes me
r
ge: A
d
d testcases fo
r
merging
n
otes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git no
t
es m
e
rge: Add another auto
-
r
esolvin
g
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
nd
git note
s
merge: --commit should fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes
m
erge: List confl
i
c
ting n
o
tes in notes
me
r
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge: Man
u
al
c
onflict
r
e
solution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
git no
t
es me
r
ge: M
a
nual conflict
resolution, part
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Documentat
i
o
n
: Preli
m
inary docs on '
g
it notes
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
git notes merge
:
A
dd automatic confl
i
ct resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
l
an
d
gi
t
notes merg
e
: Handle real, n
o
n-con
f
licting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin/
n
otes
.
c
:
Re
f
a
ctor creation of
n
otes
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t
notes mer
g
e
:
Initia
l
implementation
handling t
r
ivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/
n
ote
s
.
c: Split no
t
e
s ref DWIMmery i
n
to a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
tes
.
c: Use
two newlines (instead of one) whe
n
c
o
ncatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(
trivia
l
) t3
3
0
3: Indent with
t
abs
i
nst
e
ad of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herlan
d
n
o
tes
.
h/c:
P
r
opagate combine_no
t
es_fn return va
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an
H
erl
a
n
d
notes
.
h/c: Allow co
m
bine_notes fu
n
ctions t
o
re
m
ove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
c:
Reorder functions in pre
p
aratio
n
f
or nex
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erl
a
nd
notes
.
h: Make default_notes_
r
e
f
(
) avai
l
able in note
s
AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herla
n
d
(trivial)
n
otes
.
h: Minor documenta
t
ion
fixes to
co
p
y_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
c: Hexify
S
HA
1
in
die()
message fro
m
init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan He
r
land
no
t
es:
D
on't create (empty
)
co
m
mit
when re
m
oving no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an H
e
rland
Enable custom
schemes for column colors in the g
r
aph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herla
n
d
Make graph_ne
x
t_l
i
ne() available in the
g
raph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n Herlan
d
revision: Turn off history
si
m
plification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
r
evision: Fix typo
in --a
n
c
e
stry-path e
r
r
or message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
D
ocumen
t
ati
o
n/
r
ev-li
s
t
-
op
t
ions
.
txt: Explai
n
--anc
e
stry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
D
ocu
m
entation/rev-lis
t
-o
p
tion
s
.
txt: Fix mis
s
ing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: E
n
sure "
i
ndex
$from
.
.
$t
o
" li
n
e contain
s
unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan He
r
land
b
u
iltin-notes: Mi
n
or (mostly pars
e
_options-
r
elated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Her
l
a
n
d
s
u
b
m
od
u
le
summary:
D
on't barf wh
e
n i
n
voked
i
n
an e
m
pty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erl
a
nd
builtin-notes: Add "cop
y
" subc
o
mmand
for
c
opying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes: Misc
.
ref
a
ctoring of argc
and exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rla
n
d
built
i
n-no
t
es: Add -c/-C options for reusing note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
uil
t
in-note
s
: Refactor ha
n
dli
n
g of
-
F optio
n
to
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
bui
l
t
i
n-notes: De
p
recate th
e
-
m
/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
u
i
ltin-note
s
:
A
dd "
a
p
pend" sub
c
ommand
f
or ap
p
endin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
bui
l
tin
-
notes: Add "ad
d
"
s
ubcommand for ad
d
i
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d --mess
a
ge/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
builtin-n
o
tes: Ad
d
"list" subcomma
n
d
f
or
listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Docume
n
tatio
n
:
Generalize git-notes docs to 'object
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
Herland
b
uiltin-notes: Add "prune" subcom
m
and for remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
Notes API: pru
n
e_no
t
e
s(
)
: Prune notes that belong
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
e
rland
t
3
30
5
:
V
erify
t
h
at removing
n
o
t
es tr
i
gger
s
automa
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
bui
l
tin-notes
:
Add "r
e
mo
v
e" subcommand fo
r
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
Tea
c
h
b
ui
l
tin
-
notes to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach no
t
es
co
d
e
t
o properly preserv
e
non-not
e
s in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
t3305
:
V
e
rify
t
hat a
d
ding many notes wit
h
gi
t
-
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301:
V
erif
y
s
u
c
c
essfu
l
annotat
i
on of
n
on-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Bui
l
tin-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Ref
a
c
t
o
r not
e
s
conca
t
enatio
n
into a
f
lexible
inter
f
ac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes AP
I
:
Allow mult
i
ple concur
r
ent
not
e
s trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
N
otes API
:
write_notes_tree
(
): Store
t
h
e
notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
N
o
tes AP
I
: for_e
a
ch_note(): Tra
v
erse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
N
otes API: get_no
t
e(): Return the note
annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
Notes API: remove_note(): Remove not
e
obje
c
t
s
f
rom
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
N
otes A
P
I: add_note
(
): Add note objects
t
o the inter
n
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
n
d
N
ote
s
API: in
i
t_not
e
s(): Init
i
alize the n
o
tes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Add tests for checkin
g
correc
t
handling of $GI
T
_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herl
a
nd
N
o
tes API: get
_
com
m
i
t
_no
t
es() ->
f
ormat_note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
Minor cosmetic
fixes to note
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joha
n
Herland
b
u
i
ltin-co
n
fig:
Fix crash when using "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herl
a
nd
Add more testcase
s
to t
e
st
fast-import of
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9
3
01 t
o
t9350,
t
o make
r
o
o
m
f
or mor
e
fast
-
im
p
or
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fas
t
-import: Proper
notes tre
e
man
i
pulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
oha
n
H
e
rland
Fix crasher
o
n
e
n
countering SHA1-
l
ike non-note
i
n
not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
B
a
s
i
c buil
d
infrastructure for Python
s
c
ripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
He
r
land
Add selftests v
e
rifying
c
o
n
catenation of mu
l
tiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
Refactor not
e
s code to con
c
atenate multiple n
o
tes a
n
notating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add
selft
e
sts ve
r
ifying that we can parse notes
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herlan
d
Teach
the notes
lookup code to parse notes tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Te
a
c
h note
s
c
od
e
to f
r
e
e
i
t
s in
t
ernal data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Her
l
a
nd
A
d
d
fl
a
gs to get_
c
ommit_notes()
to cont
r
ol the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302-n
o
tes-index
-
e
xpensive
:
Speed up
c
r
e
a
t
e
_
repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
fast-import: A
d
d
s
up
p
ort for importing
c
o
m
mit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Te
a
ch "-
m
<ms
g
>" a
n
d "-F <file>" to "git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
ohan Herla
n
d
git clone: Add --
r
ecursive to automatically checkout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan
H
erland
t7407: Use 'rev-pars
e
--short' rather
than bash's
sub
s
tring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herl
a
nd
git submodule status: Add
-
-recursi
v
e
to recur
s
e into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herl
a
nd
git submodul
e
update: I
n
troduce --recursiv
e
to update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule
f
oreach: Add --recursive to
recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan He
r
la
n
d
gi
t
s
u
b
m
o
d
ule
fore
a
ch
:
test access to submodule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herl
a
nd
Add selfte
s
t for 'git sub
m
odule foreach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
an Herland
gi
t
submodule
:
Cleanu
p
usa
g
e
str
i
ng and add option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herland
git submo
d
ule foreach: Pro
v
ide a
c
cess to submodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Jo
h
an Herland
help
.
c
:
g
i
v
e
c
o
rrect st
r
uc
t
ure's
s
ize to me
m
set()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quickfetch():
Prevent ov
e
r
f
low
o
f the rev-li
s
t command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
ohan
He
r
lan
d
git-
s
u
bmodule: add support for --
m
erge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan H
e
rla
n
d
Renam
e
submodule
.
<name>
.
rebase to
s
u
bmodule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan Her
l
and
U
pdate docs on beha
v
i
o
ur o
f
'c
o
re
.
sharedRepo
s
i
t
o
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Joh
a
n H
e
rland
Mov
e
ch
m
od(
f
oo, 04
4
4
)
into move_temp_t
o
_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next