summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2023-09-18 18:20:33 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2023-09-21 10:03:56 +0200
commitaf49f8e25944785bd6970be5e9950474549f3f8c (patch)
treebc895a70e8c54bd7785fb94e14dce469da269fd0 /Documentation
parent2f3d9ce449f96bd1c1d3411cd506da22f42f6364 (diff)
downloadbarebox-af49f8e25944785bd6970be5e9950474549f3f8c.tar.gz
barebox-af49f8e25944785bd6970be5e9950474549f3f8c.tar.xz
Documentation: user: introduction: suggest b4 shazam
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> Link: https://lore.barebox.org/20230918162033.19642-1-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/user/introduction.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user/introduction.rst b/Documentation/user/introduction.rst
index e7388b8bc9..25fed6c53c 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>`_: