On Fri, Feb 24, 2023 at 7:55 AM Phillip Wood [off-list ref] wrote:

Thanks for updating this, it is much clearer what the different settings
mean now.

Happy to help. Thanks for the feedback.

I not sure if having the config setting override the default
when the user passes --rebase-merges without an argument is a good idea.

I think this behavior is confusing for users and will break scripts that
quite reasonably assume --rebase-merges is equivalent to
--rebase-merges=no-rebase-cousins

In that case, we're going to need two config options: A rebase.merges
boolean for whether --rebase-merges should be on by default and a
rebase.cousins boolean for whether rebase-cousins or no-rebase-cousins
is the default.

I will try to incorporate that change and the others that you and
Johannes suggested in v5.

-Alex