From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Oct 2019 03:25:43 GMT
Subject: Re: [PATCH] Documentation/git-bisect.txt: add --no-ff to merge command
Message-ID: <xmqq7e4o6xmw.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <xmqq4kzs8f1l.fsf@gitster-ct.c.googlers.com>

Junio C Hamano <gitster@pobox.com> writes:

> Jonathan Nieder <jrnieder@gmail.com> writes:
>
>> As an orthogonal point, I wonder whether we can start the multi-step
>> migration of making --no-commit imply --no-ff by default:
>>
>>  1. Act as --ff when --no-commit is passed without --ff or --no-ff
>>     (the state today)
>
> which means "--no-commit controls whether a new commit is created or
> not and nothing else, and because --ff is the default for merge,
> merging a true descendant will fast-forward".
>
>>  5. Refuse to perform a fast-forward merge with --no-commit is passed
>>     without --ff or --no-ff, just as though --no-ff were passed.
>
> Is that a good endgame, though?

Ah, I was confused by "refuse to perform".  You were not trying to
make the command fail outright without doing anything.  Yes, that
would be a good endgame, I would think.

I am not sure if the transition would be smooth, though.