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

Re: [GSoC][PATCH 0/4] rebase: split rebase -p from rebase -i

From
Stefan Beller <sbeller@google.com>
Date
May 22, 2018, 18:29 UTC
Message-ID
<CAGZ79kbiCE1CDMYN+aV8s9Ev2joCZJqroN3wBkoRvZZLHqOFww@mail.gmail.com>
In-Reply-To
<20180522133110.32723-1-alban.gruin@gmail.com>
On Tue, May 22, 2018 at 6:31 AM, Alban Gruin <alban.gruin@gmail.com> wrote:
Show 5 quoted lines
> This splits the `rebase --preserve-merges` functionnality from
> git-rebase--interactive.sh. This is part of the effort to depreciate
> preserve-merges. The new script, git-rebase--preserve-merges.sh, should be left
> to bitrot. All the dead code left by the duplication of
> git-rebase--interactive.sh is also removed.

... and I thought the original motivation was getting the rest of rebase into a shape that rewriting it is easier, the potential bit rot of --preserve-merges is rather a side effect, but not the main goal.

I commented on patch 1, as I don't quite understand the changes, the other patches look good to me.

Thanks, Stefan

Previous: Alban GruinNext: Alban Gruin
Message 8 of 26 in “rebase: split rebase -p from rebase -i”
  1. Alban GruinMay 22, 2018
  2. [GSoC][PATCH 1/4] rebase: duplicate git-rebase--interactive.sh to git-rebase--preserve-merges.shAlban Gruin, May 22, 2018
  3. Stefan BellerMay 22, 2018
  4. Alban GruinMay 22, 2018
  5. [GSoC][PATCH 2/4] rebase: strip unused code in git-rebase--preserve-merges.shAlban Gruin, May 22, 2018
  6. [GSoC][PATCH 3/4] rebase: use the new git-rebase--preserve-merges.shAlban Gruin, May 22, 2018
  7. [GSoC][PATCH 4/4] rebase: remove -p code from git-rebase--interactive.shAlban Gruin, May 22, 2018
  8. Stefan BellerMay 22, 2018
  9. [GSoC][PATCH v2 0/4] rebase: split rebase -p from rebase -iAlban Gruin, May 22, 2018
  10. [GSoC][PATCH v2 2/4] rebase: strip unused code in git-rebase--preserve-merges.shAlban Gruin, May 22, 2018
  11. [GSoC][PATCH v2 3/4] rebase: use the new git-rebase--preserve-merges.shAlban Gruin, May 22, 2018
  12. [GSoC][PATCH v2 1/4] rebase: duplicate git-rebase--interactive.sh to git-rebase--preserve-merges.shAlban Gruin, May 22, 2018
  13. [GSoC][PATCH v2 4/4] rebase: remove -p code from git-rebase--interactive.shAlban Gruin, May 22, 2018
  14. [GSoC][PATCH v3 0/4] rebase: split rebase -p from rebase -iAlban Gruin, May 24, 2018
  15. [GSoC][PATCH v3 4/4] rebase: remove -p code from git-rebase--interactive.shAlban Gruin, May 24, 2018
  16. [GSoC][PATCH v3 3/4] rebase: use the new git-rebase--preserve-merges.shAlban Gruin, May 24, 2018
  17. [GSoC][PATCH v3 2/4] rebase: strip unused code in git-rebase--preserve-merges.shAlban Gruin, May 24, 2018
  18. [GSoC][PATCH v3 1/4] rebase: duplicate git-rebase--interactive.sh to git-rebase--preserve-merges.shAlban Gruin, May 24, 2018
  19. Junio C HamanoMay 26, 2018
  20. Alban GruinMay 24, 2018
  21. Johannes SchindelinMay 25, 2018
  22. [GSoC][PATCH v4 0/4] rebase: split rebase -p from rebase -iAlban Gruin, May 28, 2018
  23. [GSoC][PATCH v4 1/4] rebase: introduce a dedicated backend for --preserve-mergesAlban Gruin, May 28, 2018
  24. [GSoC][PATCH v4 2/4] rebase: strip unused code in git-rebase--preserve-merges.shAlban Gruin, May 28, 2018
  25. [GSoC][PATCH v4 3/4] rebase: use the new git-rebase--preserve-merges.shAlban Gruin, May 28, 2018
  26. [GSoC][PATCH v4 4/4] rebase: remove -p code from git-rebase--interactive.shAlban Gruin, May 28, 2018

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.