Re: [PATCH v9 0/3] rebase: document, clean up, and introduce a config option for --rebase-merges

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 27, 2023, 16:33 UTC
Message-ID: <xmqq8rficfxn.fsf@gitster.g>
In-Reply-To: <19ab92b4-6b83-d788-78f2-43a3ec3ec412@dunelm.org.uk>

Phillip Wood <phillip.wood123@gmail.com> writes:

Show 16 quoted lines

> Hi Alex
>
> On 26/03/2023 04:06, Alex Henrie wrote:
>> This patch series introduces a rebase.rebaseMerges config option to
>> accommodate users who would like --rebase-merges to be on by default and
>> to facilitate turning on --rebase-merges by default without
>> configuration in a future version of Git. It also cleans up and
>> documents the behavior of the --rebase-merges command line option to
>> avoid confusion about how the config option and the command line option
>> interact.
>> Changes from v8:
>> - Add braces around one-line else clause
>> - Remove unnecessary change to error message priority
>
> The range-diff looks good to me. This iteration addresses all of my
> outstanding concerns.

Thanks, both.  Let's mark the topic as ready for 'next', then.