All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rolf Eike Beer <eb@emlix.com>
To: git@vger.kernel.org
Subject: Please add support for "git merge --continue -S"
Date: Mon, 28 Feb 2022 10:48:14 +0100	[thread overview]
Message-ID: <3769291.LUJhsIL6D6@mobilepool36.emlix.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 734 bytes --]

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,

Eike
-- 
Rolf Eike Beer, emlix GmbH, https://www.emlix.com
Fon +49 551 30664-0, Fax +49 551 30664-11
Gothaer Platz 3, 37083 Göttingen, Germany
Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160
Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055

emlix - smart embedded open source

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 313 bytes --]

             reply	other threads:[~2022-02-28  9:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-28  9:48 Rolf Eike Beer [this message]
2022-02-28 10:58 ` Please add support for "git merge --continue -S" Ævar Arnfjörð Bjarmason
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=3769291.LUJhsIL6D6@mobilepool36.emlix.com \
    --to=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.