Re: [PATCH v6 3/3] rebase: add a config option for --rebase-merges

From: Alex Henrie <alexhenrie24@gmail.com>
Date: Mar 15, 2023, 02:52 UTC
Message-ID: <CAMMLpeRGEETraueJTTV0tJSsycNYF24YX8n6h-pMp87VcCRJtQ@mail.gmail.com>
In-Reply-To: <kl6l7cvsi006.fsf@chooglen-macbookpro.roam.corp.google.com>

On Tue, Mar 7, 2023 at 5:02 PM Glen Choo <chooglen@google.com> wrote:

>
> Alex Henrie <alexhenrie24@gmail.com> writes:

Show 7 quoted lines

> > In the future, the default rebase-merges mode may change from
> > no-rebase-cousins to rebase-cousins.
>
> I suspect a more likely future would be that the default is to rebase
> 'evil' merges instead of trying to recreate merge commits, but of
> course, the important thing is that we promote the default, not what the
> default will be...

Glen, do you have any more thoughts? At this point, the only thing that's keeping me from implementing Phillip's request to make --rebase-merges without an argument clobber rebase.rebaseMerges is your suspicion that we might need to change the default rebase-merges mode in the future, and I assume that we would want to use the rebase.rebaseMerges config option to facilitate the transition.

-Alex