Le 29/05/2020 à 16:45, Eric Blake a écrit : > Prefer a consistent naming for the --merge argument. > > Fixes: 3b51ab4bf > Signed-off-by: Eric Blake <ebl...@redhat.com> > --- > > I'm happy for this to go in through my bitmaps queue or through the > trivial tree, whichever picks it up first. > > docs/tools/qemu-img.rst | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst > index 69cd9a30373a..7f0737488ade 100644 > --- a/docs/tools/qemu-img.rst > +++ b/docs/tools/qemu-img.rst > @@ -300,7 +300,7 @@ Command description: > > ``--disable`` to change *BITMAP* to stop recording future edits. > > - ``--merge`` to merge the contents of *SOURCE_BITMAP* into *BITMAP*. > + ``--merge`` to merge the contents of the *SOURCE* bitmap into *BITMAP*. > > Additional options include ``-g`` which sets a non-default > *GRANULARITY* for ``--add``, and ``-b`` and ``-F`` which select an >
Applied to my trivial-patches branch. Thanks, Laurent
