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

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 7, 2020, 20:11 UTC
Message-ID: <xmqqy2uj3u3q.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BEoTb6LVXThEM4zoKxVOnzBNs7y-Mk+oFbb6BUzCo3RHg@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 12 quoted lines

> 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.