[PATCH] Documentation: user: introduction: suggest b4 shazam

[PATCH] Documentation: user: introduction: suggest b4 shazam

[Ahmad Fatoum]

b4 am requires manual application of the patch. b4 shazam -M fetches the
series into a branch (FETCH_HEAD) and has a useful heuristic for when
the base the patch applies on is unknown.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 Documentation/user/introduction.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/user/introduction.rst b/Documentation/user/introduction.rst
index e7388b8bc95e..25fed6c53c4d 100644
--- a/Documentation/user/introduction.rst
+++ b/Documentation/user/introduction.rst
@@ -29,11 +29,11 @@ http://lists.infradead.org/mailman/listinfo/barebox/
 Mails sent to the barebox mailing list are archived on
 `lore.barebox.org <https://lore.barebox.org/barebox/>`_.
 
-Patch series sent there can be fetched with `b4 <https://pypi.org/project/b4/>`_ ::
+Patch series sent there can be applied with `b4 <https://pypi.org/project/b4/>`_ ::
 
    git config b4.midmask https://lore.barebox.org/%s
    git config b4.linkmask https://lore.barebox.org/%s
-   b4 am https://lore.barebox.org/$messageid # replace with link
+   b4 shazam -M https://lore.barebox.org/$messageid # replace with link
 
 There's also an IRC channel, which is
 `bridged to Matrix  <https://app.element.io/#/room/#barebox:matrix.org>`_:
-- 
2.39.2

Re: [PATCH] Documentation: user: introduction: suggest b4 shazam

[Sascha Hauer]

On Mon, Sep 18, 2023 at 06:20:33PM +0200, Ahmad Fatoum wrote:
> b4 am requires manual application of the patch. b4 shazam -M fetches the
> series into a branch (FETCH_HEAD) and has a useful heuristic for when
> the base the patch applies on is unknown.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  Documentation/user/introduction.rst | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/Documentation/user/introduction.rst b/Documentation/user/introduction.rst
> index e7388b8bc95e..25fed6c53c4d 100644
> --- a/Documentation/user/introduction.rst
> +++ b/Documentation/user/introduction.rst
> @@ -29,11 +29,11 @@ http://lists.infradead.org/mailman/listinfo/barebox/
>  Mails sent to the barebox mailing list are archived on
>  `lore.barebox.org <https://lore.barebox.org/barebox/>`_.
>  
> -Patch series sent there can be fetched with `b4 <https://pypi.org/project/b4/>`_ ::
> +Patch series sent there can be applied with `b4 <https://pypi.org/project/b4/>`_ ::
>  
>     git config b4.midmask https://lore.barebox.org/%s
>     git config b4.linkmask https://lore.barebox.org/%s
> -   b4 am https://lore.barebox.org/$messageid # replace with link
> +   b4 shazam -M https://lore.barebox.org/$messageid # replace with link
>  
>  There's also an IRC channel, which is
>  `bridged to Matrix  <https://app.element.io/#/room/#barebox:matrix.org>`_:
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |