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

[PATCH 0/5] Clean up after the removal of the scripted rebase

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
May 14, 2019, 11:22 UTC
Message-ID
<pull.194.git.gitgitgadget@gmail.com>

Technically, there is still one part that is scripted: git rebase --preserve-merges. But that is already deprecated, and the remaining parts really are no longer scripted.

Meaning that we do not need git-rebase--am.sh.

While at it, clean up a few other places that reference the scripted rebase, and also move the functions from git-rebase--common.sh directly into the -p backend (because it is the sole remaining user).

Johannes Schindelin (5):
  Drop unused git-rebase--am.sh
  t3400: stop referring to the scripted rebase
  .gitignore: there is no longer a built-in `git-rebase--interactive`
  sequencer: the `am` and `rebase--interactive` scripts are gone
  rebase: fold git-rebase--common into the -p backend
 .gitignore                     |  3 --
 Makefile                       |  2 -
 builtin/rebase.c               |  7 +--
 git-rebase--am.sh              | 85 ----------------------------------
 git-rebase--common.sh          | 69 ---------------------------
 git-rebase--preserve-merges.sh | 55 ++++++++++++++++++++++
 sequencer.c                    |  2 +-
 t/t3400-rebase.sh              |  2 +-
 8 files changed, 58 insertions(+), 167 deletions(-)
 delete mode 100644 git-rebase--am.sh
 delete mode 100644 git-rebase--common.sh
base-commit: ab15ad1a3b4b04a29415aef8c9afa2f64fc194a2
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-194%2Fdscho%2Fdrop-rebase--am.sh-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-194/dscho/drop-rebase--am.sh-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/194
-- 
gitgitgadget
Next: Johannes Schindelin via GitGitGadget
Message 1 of 6 in “Clean up after the removal of the scripted rebase”
  1. 0/5 Clean up after the removal of the scripted rebaseJohannes Schindelin via GitGitGadget, May 14, 2019
  2. 1/5 Drop unused git-rebase--am.shJohannes Schindelin via GitGitGadget, May 14, 2019
  3. 2/5 t3400: stop referring to the scripted rebaseJohannes Schindelin via GitGitGadget, May 14, 2019
  4. 5/5 rebase: fold git-rebase--common into the -p backendJohannes Schindelin via GitGitGadget, May 14, 2019
  5. 4/5 sequencer: the `am` and `rebase--interactive` scripts are goneJohannes Schindelin via GitGitGadget, May 14, 2019
  6. 3/5 .gitignore: there is no longer a built-in `git-rebase--interactive`Johannes Schindelin via GitGitGadget, May 14, 2019

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.