From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Daniel Vicarel <shundra8820@gmail.com>, git@vger.kernel.org
Subject: Re: Why does "merge --continue" expect no arguments?
Date: Fri, 24 Dec 2021 18:08:32 +0100 [thread overview]
Message-ID: <211224.86mtkqgc8e.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <xmqqlf0dq3t3.fsf@gitster.g>
On Tue, Dec 21 2021, 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".
But it's not:
$ git add foo
$ git commit -v
hint: Waiting for your editor to close the file.[...]
^C
$ git merge --continue
fatal: There is no merge in progress (MERGE_HEAD missing).
FWIW I prefer and use it for that reason, i.e. it's useful for scripting
to use these "stateful" commands when we're in some sort of rebase/merge
"sequence" since it's an extra layer of sanity checking.
next prev parent reply other threads:[~2021-12-24 17:10 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 [this message]
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=211224.86mtkqgc8e.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--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 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.