From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/5] Clean up after the removal of the scripted rebase
Date: Tue, 14 May 2019 04:22:30 -0700 (PDT) [thread overview]
Message-ID: <pull.194.git.gitgitgadget@gmail.com> (raw)
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 reply other threads:[~2019-05-14 11:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-14 11:22 Johannes Schindelin via GitGitGadget [this message]
2019-05-14 11:22 ` [PATCH 2/5] t3400: stop referring to the scripted rebase Johannes Schindelin via GitGitGadget
2019-05-14 11:22 ` [PATCH 1/5] Drop unused git-rebase--am.sh Johannes Schindelin via GitGitGadget
2019-05-14 11:22 ` [PATCH 3/5] .gitignore: there is no longer a built-in `git-rebase--interactive` Johannes Schindelin via GitGitGadget
2019-05-14 11:22 ` [PATCH 4/5] sequencer: the `am` and `rebase--interactive` scripts are gone Johannes Schindelin via GitGitGadget
2019-05-14 11:22 ` [PATCH 5/5] rebase: fold git-rebase--common into the -p backend Johannes Schindelin via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.194.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).