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

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

From
Elijah Newren <newren@gmail.com>
Date
Feb 20, 2023, 16:41 UTC
Message-ID
<CABPp-BE8yAqFi6Pjyfn=Sk_q3udP8ffgbf=ZAbCkZBYTKcPN9g@mail.gmail.com>
In-Reply-To
<20230220033224.10400-2-alexhenrie24@gmail.com>
On Sun, Feb 19, 2023 at 7:33 PM Alex Henrie <alexhenrie24@gmail.com> wrote:
>
> At the same time, stop accepting --rebase-merges="" as a synonym of
> --rebase-merges=no-rebase-cousins.

I thought this meant you were turning "git rebase --rebase-merges ..." into an error unless the '=' was provided. I checked out the code to verify and realized my understanding was wrong. Maybe I'm not as bright as other folks, but just in case, it might be worth clarifying that you're not doing that in the commit message.

Also, I agree with Phillip that this change should probably be split out into its own commit, if it's kept.

Previous: Alex HenrieNext: Phillip Wood
Message 5 of 16 in “rebase: add a --rebase-merges=drop option”
  1. 1/2 rebase: add a --rebase-merges=drop optionAlex Henrie, Feb 20, 2023
  2. 2/2 rebase: add a config option for --rebase-mergesAlex Henrie, Feb 20, 2023
  3. Phillip WoodFeb 20, 2023
  4. Alex HenrieFeb 20, 2023
  5. Elijah NewrenFeb 20, 2023
  6. Phillip WoodFeb 20, 2023
  7. Alex HenrieFeb 20, 2023
  8. Junio C HamanoFeb 20, 2023
  9. Philip OakleyFeb 21, 2023
  10. Junio C HamanoFeb 21, 2023
  11. 0/1 cover-letter: flattenPhilip Oakley, May 13, 2023
  12. 1/1 doc: Glossary, describe FlatteningPhilip Oakley, May 13, 2023
  13. Junio C HamanoMay 15, 2023
  14. Philip OakleyMay 27, 2023
  15. Kristoffer HaugsbakkMay 19, 2023
  16. Philip OakleyMay 27, 2023

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.