From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Rolf Eike Beer <eb@emlix.com>
Cc: git@vger.kernel.org
Subject: Re: Please add support for "git merge --continue -S"
Date: Mon, 28 Feb 2022 11:58:11 +0100 [thread overview]
Message-ID: <220228.86fso35k61.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <3769291.LUJhsIL6D6@mobilepool36.emlix.com>
On Mon, Feb 28 2022, Rolf Eike Beer wrote:
> [[PGP Signed Part:Undecided]]
> Hi,
>
> I usually sign my commits and merges. But when a merge has collisions I can't
> continue and sign in one step, because --continue and -S seem to be mutually
> exclusive. My way out is:
>
> git merge --continue
> git commit --amend --no-edit -S
>
> ... but this could be a bit simpler. Or maybe --continue could remember if I
> have passed "-S" to the original "git merge" command.
>
> Regards,
You can just drop the use of "merge --continue" entirely and use
"commit" instead.
Caveats related to this were recently discussed on-list:
https://lore.kernel.org/git/CALRdAfcyfesNqfLhhe2GW_5V9s2hf++i6mZS1Lw5hqQYTca85w@mail.gmail.com/
As noted there I think this makes for confusing UI, but you should able to just:
git commit -S
next prev parent reply other threads:[~2022-02-28 11:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 9:48 Please add support for "git merge --continue -S" Rolf Eike Beer
2022-02-28 10:58 ` Ævar Arnfjörð Bjarmason [this message]
2022-02-28 22:53 ` Junio C Hamano
2022-02-28 23:28 ` Ævar Arnfjörð Bjarmason
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=220228.86fso35k61.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=eb@emlix.com \
--cc=git@vger.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 NNTP newsgroup(s).