From: Daniel Vicarel <shundra8820@gmail.com>
To: Chris Packham <judge.packham@gmail.com>
Cc: GIT <git@vger.kernel.org>
Subject: Re: Why does "merge --continue" expect no arguments?
Date: Thu, 23 Dec 2021 01:07:56 -0500 [thread overview]
Message-ID: <CALRdAfcKSsct1gD87Pkjugttr3pFbXnh0W=kVa95G+9ZpNtLnA@mail.gmail.com> (raw)
In-Reply-To: <CAFOYHZC0r35mfOVUExHsBP5=URKFAt_wDTZ51pTc=XkXyogqKQ@mail.gmail.com>
Thanks for the input, all.
Junio C Hamano <gitster@pobox.com> writes:
> perhaps the doc update would be the quickest one that offers the most to learn from
Sounds good! Now by "doc update" do you mean updating docs in the
Documentation/ folder, or adding a warning to the CLI output of `git
merge --continue`?
Junio C Hamano <gitster@pobox.com> writes:
> coming up with a sensible list of allowed options and arguments [to `git merge --continue`] would be quite hard.
Chris Packham <judge.packham@gmail.com> writes:
> I think it'd be a good idea to allow [--no-edit on `git merge --continue`] as long as it's the only other option allowed with --continue.
Based on these two pieces of feedback, it sounds like adding _just_
the `--no-edit` option at this point to `git merge --continue` is
worthwhile, and hopefully approachable for a newb. For now I'll put a
pin in it though, and focus on the documentation task above.
On Wed, Dec 22, 2021 at 2:46 AM Chris Packham <judge.packham@gmail.com> wrote:
>
> Hi Daniel,
>
> On Wed, 22 Dec 2021, 2:54 PM Daniel Vicarel, <shundra8820@gmail.com> wrote:
>>
>> 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.
>
>
> I added the --continue option to merge and I can tell you there was no reason --no-edit was omitted, I just didn't think of it at the time. I think it'd be a good idea to allow it as long as it's the only other option allowed with --continue.
>>
>>
>> Thanks,
>> Dan Vicarel (he/him)
--
Dan Vicarel
next prev parent reply other threads:[~2021-12-23 6:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 14:50 Why does "merge --continue" expect no arguments? Daniel Vicarel
2021-12-21 17:13 ` 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 [this message]
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='CALRdAfcKSsct1gD87Pkjugttr3pFbXnh0W=kVa95G+9ZpNtLnA@mail.gmail.com' \
--to=shundra8820@gmail.com \
--cc=git@vger.kernel.org \
--cc=judge.packham@gmail.com \
/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).