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

Re: "rebase -ri" (was Re: Problems with ra/rebase-i-more-options - should we revert it?)

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 15, 2020, 22:53 UTC
Message-ID
<xmqqr200ib73.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<xmqqftggk2oi.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
>> Having said that, if you ever find yourself wanting Just One Feature in
>> `--rebase-merges` that would make it worthwhile for you to think about
>> switching your patch-based workflow to a `rebase -ir`-based one, please
>> let me know, and I will try my best to accommodate.

I missed a mention of 'patch' here when I prepared my earlier reply. I do not expect "rebase -ri" to play any role in the part of the workflow that accepts patches from the mailing list.

The involvement of "rebase -ri" (vs Meta/Reintegrate) is purely what happens after a topic is queued and starts to get tested with other topics on integration branches, and no "patch based workflow" plays any role there---it does not make any sense to base that part on anything but merge (and possibly cherry-picking an evil merge from an earlier round).

Previous: Sergey Organov
Message 14 of 14 in “Problems with ra/rebase-i-more-options - should we revert it?”
  1. Phillip WoodJan 12, 2020
  2. Phillip WoodJan 12, 2020
  3. Johannes SchindelinJan 12, 2020
  4. Phillip WoodJan 17, 2020
  5. Johannes SchindelinJan 20, 2020
  6. Junio C HamanoJan 12, 2020
  7. Junio C HamanoJan 13, 2020
  8. Junio C HamanoJan 13, 2020
  9. "rebase -ri" (was Re: Problems with ra/rebase-i-more-options - should we revert it?)Junio C Hamano, Jan 13, 2020
  10. Johannes SchindelinJan 15, 2020
  11. Junio C HamanoJan 15, 2020
  12. Rebasing evil merges with --rebase-mergesIgor Djordjevic, Jan 15, 2020
  13. Sergey OrganovJan 16, 2020
  14. Junio C HamanoJan 15, 2020

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.