Re: [PATCH v3 10/15] rebase: add an --am option

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Jan 8, 2020, 14:32 UTC
Message-ID: <9ac52ef1-c1cb-45aa-178a-ec5a282bd761@gmail.com>
In-Reply-To: <xmqqy2uj3u3q.fsf@gitster-ct.c.googlers.com>

On 07/01/2020 20:11, Junio C Hamano wrote:

Show 19 quoted lines

> Elijah Newren <newren@gmail.com> writes:
> 
>> However, I thought of this option before Junio suggested a
>> rebase.backend config setting, so we could just rely on that instead.
>> Thus, getting rid of the "--am" flag in detail would mean:
>>    * I need to redo the test changes in this series to use "-c
>> rebase.backend=am" instead of "--am"
>>    * It will be slightly harder for users to use the escape hatch in
>> one-off cases during the transition
>>    * We need to figure out the right way to reword the documentation
>>
>> The first two are pretty minor, so that probably means I just need to
>> come up with some good wording for the documentation (suggestions
>> welcome...)
> 
> It probably is a good idea to keep --am (and possibly --[no-]am) as
> long as rebase.backend option exists.  A configuration variable that
> changes behaviour without allowing it to be overridden from the
> command line is not a good idea.

I view this change in the default backend as similar to the rewrite in C in that it is an implementation detail we're changing that should be transparent (and beneficial in terms of performance) to the user. There we provided a configuration variable but not a command line option to control if it was used or not. I don't see it as something the user will want to change from rebase to rebase but perhaps I'm missing something.

Best Wishes

Phillip