summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-05-14 11:22:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-15 01:57:31 (GMT)
commit311c00aae87b0b91e65140dea3d2ef54119c294a (patch)
tree56e6518f673be66a48a411838c032851ebb39c0d /builtin
parentab15ad1a3b4b04a29415aef8c9afa2f64fc194a2 (diff)
downloadgit-311c00aae87b0b91e65140dea3d2ef54119c294a.zip
git-311c00aae87b0b91e65140dea3d2ef54119c294a.tar.gz
git-311c00aae87b0b91e65140dea3d2ef54119c294a.tar.bz2
Drop unused git-rebase--am.sh
Since 21853626ea (built-in rebase: call `git am` directly, 2019-01-18), the built-in rebase already uses the built-in `git am` directly. Now that d03ebd411c (rebase: remove the rebase.useBuiltin setting, 2019-03-18) even removed the scripted rebase, there is no longer any user of `git-rebase--am.sh`, so let's just remove it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rebase.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index ba3a574..d5f6f40 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1153,10 +1153,6 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
}
switch (opts->type) {
- case REBASE_AM:
- backend = "git-rebase--am";
- backend_func = "git_rebase__am";
- break;
case REBASE_PRESERVE_MERGES:
backend = "git-rebase--preserve-merges";
backend_func = "git_rebase__preserve_merges";