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

[PATCH 0/2] Let the sequencer handle the grunt work of rebase -i

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Sep 2, 2016, 08:34 UTC
Message-ID
<cover.1472805251.git.johannes.schindelin@gmx.de>

After all of these patch series y'all had to review, this is finally the one that switches things over.

Please note that it does not (yet) handle the `git rebase -i --root` invocation; I tried to focus on the common case, and I rarely use --root myself.

Please note also that --preserve-merges is *not* handled.

The way I designed --preserve-merges is totally stupid and idiotic and I do not want to spend any further time on it. You cannot "pick" merges and hope to be able to reorder commits, for example.

And please finally note that this pair of patches does not yet yield the full speed improvement that I promised earlier. After these patches, the time is dominated by pre- and post-processing the todo script, at least on Windows, so there is another patch series that ports those bits and pieces into the rebase--helper, too.

Johannes Schindelin (2):
  Add a builtin helper for interactive rebases
  rebase -i: use the rebase--helper builtin
 .gitignore                 |  1 +
 Makefile                   |  1 +
 builtin.h                  |  1 +
 builtin/rebase--helper.c   | 40 ++++++++++++++++++++++++++++++++++++++++
 git-rebase--interactive.sh | 13 +++++++++++++
 git.c                      |  1 +
 6 files changed, 57 insertions(+)
 create mode 100644 builtin/rebase--helper.c
Based-On: sequencer-i at https://github.com/dscho/git
Fetch-Base-Via: git fetch https://github.com/dscho/git sequencer-i
Published-As: https://github.com/dscho/git/releases/tag/rebase--helper-v1
Fetch-It-Via: git fetch https://github.com/dscho/git rebase--helper-v1
-- 
2.9.3.windows.3

base-commit: bbec81903b5e46c481fdc0cfe6f10166423526f1
Next: Johannes Schindelin
Message 1 of 7 in “Let the sequencer handle the grunt work of rebase -i”
  1. 0/2 Let the sequencer handle the grunt work of rebase -iJohannes Schindelin, Sep 2, 2016
  2. 2/2 rebase -i: use the rebase--helper builtinJohannes Schindelin, Sep 2, 2016
  3. 1/2 Add a builtin helper for interactive rebasesJohannes Schindelin, Sep 2, 2016
  4. 0/2 Let the sequencer handle the grunt work of rebase -iJohannes Schindelin, Feb 9, 2017
  5. 2/2 rebase -i: use the rebase--helper builtinJohannes Schindelin, Feb 9, 2017
  6. 1/2 Add a builtin helper for interactive rebasesJohannes Schindelin, Feb 9, 2017
  7. Junio C HamanoFeb 9, 2017

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.