From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 24 Dec 2021 17:08:32 GMT
Subject: Re: Why does "merge --continue" expect no arguments?
Message-ID: <211224.86mtkqgc8e.gmgdl@evledraar.gmail.com>
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.