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

Re: Limitiations of git rebase --preserve-merges --interactive

From
Anatoly Borodin <anatoly.borodin@gmail.com>
Date
Sep 22, 2016, 21:01 UTC
Message-ID
<ns1gr4$pjs$1@blaine.gmane.org>
In-Reply-To
<1mtveu4.19lvgi1c0hmhaM%lists@haller-berlin.de>
Hi Stefan,

I've also done some archaeology and found that the original version of the merge preserving code was written by Johannes Schindelin <Johannes.Schindelin@gmx.de>, see e.g. f09c9b8c5ff9d8a15499b09ccd6c3e7b3c76af77

There were also some big discussion threads in 2007-2008 regarding a better mechanism to "mark" or "tag" the heads of rebased branches, but I haven't seen consensus and development in that direction after that.

PS There are also some pieces of "what should work" in these tests:

t/t3409-rebase-preserve-merges.sh* t/t3410-rebase-preserve-dropped-merges.sh* t/t3411-rebase-preserve-around-merges.sh* t/t3414-rebase-preserve-onto.sh*

-- 
Mit freundlichen Grüßen,
Anatoly Borodin
Previous: Anatoly BorodinNext: Stefan Beller
Message 9 of 15 in “Limitiations of git rebase --preserve-merges --interactive”
  1. Stefan HallerSep 20, 2016
  2. Anatoly BorodinSep 22, 2016
  3. Kevin DaudtSep 22, 2016
  4. Stefan BellerSep 22, 2016
  5. Stefan HallerSep 23, 2016
  6. Johannes SchindelinSep 23, 2016
  7. Stefan BellerSep 23, 2016
  8. Anatoly BorodinSep 22, 2016
  9. Anatoly BorodinSep 22, 2016
  10. Stefan BellerSep 22, 2016
  11. Johannes SchindelinSep 23, 2016
  12. Stefan HallerSep 23, 2016
  13. Junio C HamanoSep 23, 2016
  14. Stefan HallerSep 23, 2016
  15. Johannes SixtSep 23, 2016

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.