git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[RFC] Add config option corresponding to --rebase-merges

From
DHDakota Hawkins <dakota@dakotahawkins.com>
Date
Aug 23, 2019, 17:19 UTC
Message-ID
<CAHnyXxScGO6Eex_AEbgH=YFQ2yzY1hnXavyNMkiXbrccVUA=Ug@mail.gmail.com>

I'd like to work on a patch to add config options that correspond to rebase's --rebase-merges flag.

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.

If nobody has any opposition to the concept, the following are the specific options and values that I think makes sense and covers the existing functionality.

# 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

I'd like to get feedback on the idea and specific options proposed, if only to avoid having to tweak them once they've been added.

Thanks,
Dakota Hawkins
Next: Dakota Hawkins
Message 1 of 4 in “[RFC] Add config option corresponding to --rebase-merges”
  1. Dakota HawkinsAug 23, 2019
  2. Dakota HawkinsAug 24, 2019
  3. Johannes SchindelinAug 26, 2019
  4. Dakota HawkinsAug 26, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.