On Tue, Mar 7, 2023 at 5:02 PM Glen Choo <chooglen@xxxxxxxxxx> wrote: > > Alex Henrie <alexhenrie24@xxxxxxxxx> writes: > > 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
