From: Philip Oakley <philipoakley@iee.email>
To: Junio C Hamano <gitster@pobox.com>,
Daniel Vicarel <shundra8820@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Why does "merge --continue" expect no arguments?
Date: Tue, 21 Dec 2021 17:57:30 +0000 [thread overview]
Message-ID: <fcdef044-8bec-35b4-431f-40a79ed3c47b@iee.email> (raw)
In-Reply-To: <xmqqlf0dq3t3.fsf@gitster.g>
On 21/12/2021 17:13, Junio C Hamano wrote:
> Or we could throw in another
>
> * document more clearly that "merge --continue" is a mere synonym
> for, and hint that there is no reason to favor it over, "git
> commit".
>
> which happens to be my favourite so far after thinking the above
> through.
>
> Thanks.
I'm all for including the "document more clearly" approach...
With or without the code change.
--
Philip
next prev parent reply other threads:[~2021-12-21 17:57 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 [this message]
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=fcdef044-8bec-35b4-431f-40a79ed3c47b@iee.email \
--to=philipoakley@iee.email \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=shundra8820@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).