git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Vicarel <shundra8820@gmail.com>
To: git@vger.kernel.org
Subject: Why does "merge --continue" expect no arguments?
Date: Tue, 21 Dec 2021 09:50:56 -0500	[thread overview]
Message-ID: <CALRdAfcyfesNqfLhhe2GW_5V9s2hf++i6mZS1Lw5hqQYTca85w@mail.gmail.com> (raw)

There are several git commands that take a "--continue"
option...`merge`, `rebase`, `cherry-pick`, etc. From looking through
the source though, only `merge --continue` seems to expect no other
arguments. Suppose that you have just resolved some merge conflicts,
and then want to run `git merge --continue --no-edit` to accept the
default merge commit message. Having to open/close the configured text
editor still is mildly annoying. I'm interested in submitting a patch
to "fix" this `merge` behavior, but I wanted to check if this was
really the intended behavior first, and if so why.

Thanks,
Dan Vicarel (he/him)

             reply	other threads:[~2021-12-21 14:51 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-21 14:50 Daniel Vicarel [this message]
2021-12-21 17:13 ` Why does "merge --continue" expect no arguments? Junio C Hamano
2021-12-21 17:51   ` Daniel Vicarel
2021-12-21 17:54     ` Daniel Vicarel
2021-12-22  6:20     ` Junio C Hamano
2021-12-21 17:57   ` Philip Oakley
2021-12-24 17:08   ` Ævar Arnfjörð Bjarmason
2021-12-25  2:01     ` Junio C Hamano
2021-12-26 23:31       ` Ævar Arnfjörð Bjarmason
2021-12-27 19:29         ` Junio C Hamano
     [not found] ` <CAFOYHZC0r35mfOVUExHsBP5=URKFAt_wDTZ51pTc=XkXyogqKQ@mail.gmail.com>
2021-12-23  6:07   ` Daniel Vicarel
2021-12-23 18:35     ` Junio C Hamano

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=CALRdAfcyfesNqfLhhe2GW_5V9s2hf++i6mZS1Lw5hqQYTca85w@mail.gmail.com \
    --to=shundra8820@gmail.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).