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

Re: Feature request: rebase -i inside of rebase -i

From
SBSebastien Bruckert <sbruckert.dev@gmail.com>
Date
Apr 6, 2020, 10:40 UTC
Message-ID
<CA+KXf2C0XytyNEAAdTOZAzw5YTQuv3PSjJ7RgyWqTj9MPp6BDQ@mail.gmail.com>
In-Reply-To
<20200404174116.GB11944@SDF.ORG>
Hi all,

What is your problem actually ? You want to edit a commit before where you are in a rebase ?

O --- A --- B --- C --- D
* You are in a middle of a rebase at commit C.
* You want to edit A without finishing all your actual rebase.
Is that right ?
Then, why making a whole new rebase for that operation ?

In this example, you are finally editing A with some sort of new nested operation. This operation should not do anything else than this. Like something atomical, you edit the commit / add a commit / remove one, and that's all. End of the story. Back to the original rebase, and back to commit C. If that "nested" operation made conflict with B, we can move the actual rebase to B to clean the mess you made with the "nested" operation. But you are still in only one rebase. If you abort, everything gets cleaned up.

I don't know if any of this is pertinent / understandable, but I hope it gave a fresh view on that. You guys are maybe a bit too focused on what to do in case of an abort of a nested rebase. However, we don't actually know if a nested rebase is the best solution for this job.

My two cents
Previous: George SpelvinNext: George Spelvin
Message 18 of 25 in “Feature request: rebase -i inside of rebase -i”
  1. George SpelvinMar 20, 2020
  2. Junio C HamanoMar 20, 2020
  3. George SpelvinMar 20, 2020
  4. Johannes SchindelinMar 21, 2020
  5. George SpelvinMar 21, 2020
  6. Johannes SchindelinMar 25, 2020
  7. George SpelvinMar 26, 2020
  8. Johannes SchindelinMar 28, 2020
  9. George SpelvinMar 28, 2020
  10. George SpelvinMar 31, 2020
  11. Philip OakleyMar 31, 2020
  12. Phillip WoodMar 31, 2020
  13. Philip OakleyApr 1, 2020
  14. Phillip WoodApr 7, 2020
  15. Johannes SchindelinApr 4, 2020
  16. Johannes SchindelinApr 4, 2020
  17. George SpelvinApr 4, 2020
  18. Sebastien BruckertApr 6, 2020
  19. George SpelvinApr 6, 2020
  20. Sebastien BruckertApr 7, 2020
  21. George SpelvinApr 7, 2020
  22. Philip OakleyMar 30, 2020
  23. George SpelvinMar 30, 2020
  24. Philip OakleyMar 30, 2020
  25. Johannes SixtMar 21, 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.