git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Please add support for "git merge --continue -S"

From
RBRolf Eike Beer <eb@emlix.com>
Date
Feb 28, 2022, 09:48 UTC
Message-ID
<3769291.LUJhsIL6D6@mobilepool36.emlix.com>
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
Next: Ævar Arnfjörð Bjarmason
Message 1 of 4 in “Please add support for "git merge --continue -S"”
  1. Rolf Eike BeerFeb 28, 2022
  2. Ævar Arnfjörð BjarmasonFeb 28, 2022
  3. Junio C HamanoFeb 28, 2022
  4. Ævar Arnfjörð BjarmasonFeb 28, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.