Add config option corresponding to --rebase-merges flag

[dakotahawkins]

In my workflow, while it's uncommon to encounter merge commits during a rebase operation, when they are encountered I pretty much always want this behavior. Since it's rare, I pretty much always forget to ask for it, with interesting and confusing consequences.

Is there any appetite for a rebase.rebaseMerges boolean that could drive the default for this option?

Thanks,

Dakota

[dscho]

Good idea!!!

[dakotahawkins]

For completeness, it should probably handle the --rebase-merges=rebase-cousins option.

That could either be:

• Something like config.rebase.rebaseMerges=(true|false|rebase-cousins|no-rebase-cousins), where true and no-rebase-cousins do the same thing, or
• A separate config.rebase.rebaseMergesCousins=(true|false)

Personally, I'm leaning towards the latter because it seems easier to reason about. Any thoughts?

Edit: Took a closer look at the existing options and the following is what I sent to the mailing list in a RFC:

# New rebase.merges config that takes effect if set to true or cousins
+ rebase.merges=
+   true
+   cousins

# New cousins value for pull.rebase
pull.rebase=
+   cousins
    
# New pull.rebaseMerges config that takes effect if set to true or
# cousins. Intended to allow pull.rebase to be set to interactive.
+ pull.rebaseMerges=
+   true
+   cousins

# Corresponding additions for branch.<name> config
branch.<name>.rebase=
+   cousins

+ branch.<name>.rebaseMerges=
+   true
+   cousins

[LemmingAvalanche]

rebase.rebaseMerges exists now. Close?

[dscho]

Indeed, and here is the documentation. Thank you!