From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: tools@linux.kernel.org
Cc: kernel@pengutronix.de
Subject: [PATCH b4] mbox: Suggest git am -3 if b4 am -3 was used
Date: Thu, 30 Nov 2023 11:39:26 +0100 [thread overview]
Message-ID: <20231130103925.987426-1-u.kleine-koenig@pengutronix.de> (raw)
Preparing the patches for a 3-way merge is only sensible if they are
applied benefiting from that additional information. So add -3 to the
git am cmdline suggested in the output of b4 am -3.
---
b4/mbox.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/b4/mbox.py b/b4/mbox.py
index 054bab7bac1d..feba53465e77 100644
--- a/b4/mbox.py
+++ b/b4/mbox.py
@@ -418,7 +418,7 @@ def make_am(msgs: List[email.message.Message], cmdargs: argparse.Namespace, msgi
if base_commit is not None:
logger.critical(' git checkout -b %s %s', gitbranch, base_commit)
if cmdargs.outdir != '-':
- logger.critical(' git am %s', am_filename)
+ logger.critical(' git am %s%s', '-3 ' if cmdargs.threeway else '', am_filename)
thanks_record_am(lser, cherrypick=cherrypick)
base-commit: 5c0668ec3daeae4cc8c6425db360e7a80e060201
--
2.42.0.586.gbc5204569f7d.dirty
next reply other threads:[~2023-11-30 10:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-30 10:39 Uwe Kleine-König [this message]
2023-11-30 14:08 ` [PATCH b4] mbox: Suggest git am -3 if b4 am -3 was used Konstantin Ryabitsev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231130103925.987426-1-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=kernel@pengutronix.de \
--cc=tools@linux.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).