summaryrefslogtreecommitdiff
path: root/man/b4.5.rst
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2022-06-17 10:36:35 -0400
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2022-06-17 10:36:35 -0400
commitb7ac0605e148a8d8808eeddd2e03e0ca6822cb5c (patch)
treee7a8b272a24845c5e39ab6f74f66029dc2cfff8d /man/b4.5.rst
parent797fc250c7dd64550f2283bdc749eda7555e3fa3 (diff)
downloadb4-b7ac0605e148a8d8808eeddd2e03e0ca6822cb5c.tar.gz
Add ability to exit before git-merge is invoked
It may be useful for the maintainer to review b4 retrieval/validation output before git-merge is invoked, so add a pause requiring an Enter or Ctrl-C. Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Diffstat (limited to 'man/b4.5.rst')
-rw-r--r--man/b4.5.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/man/b4.5.rst b/man/b4.5.rst
index 7bda7db..d4a26de 100644
--- a/man/b4.5.rst
+++ b/man/b4.5.rst
@@ -41,9 +41,11 @@ OPTIONS
-h, --help show this help message and exit
-d, --debug Add more debugging info to the output (default: False)
-q, --quiet Output critical information only (default: False)
+-n, --no-interactive Do not ask any interactive questions (default: False)
SUBCOMMAND OPTIONS
------------------
+
b4 mbox
~~~~~~~
@@ -163,7 +165,7 @@ options:
*Example*: b4 am 20200313231252.64999-1-keescook@chromium.org
b4 shazam
----------
+~~~~~~~~~
This is very similar to **b4 am**, but will also apply patches
directly to the current git tree using ``git am``. Alternatively, when