Skip to content

Commit fa2b967

Browse files
committed
Drop unused git-rebase--am.sh
Since 2185362 (built-in rebase: call `git am` directly, 2019-01-18), the built-in rebase already uses the built-in `git am` directly. Now that d03ebd4 (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 <[email protected]>
1 parent ab15ad1 commit fa2b967

File tree

4 files changed

+0
-91
lines changed

4 files changed

+0
-91
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
/git-range-diff
123123
/git-read-tree
124124
/git-rebase
125-
/git-rebase--am
126125
/git-rebase--common
127126
/git-rebase--interactive
128127
/git-rebase--preserve-merges

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,6 @@ SCRIPT_SH += git-web--browse.sh
624624

625625
SCRIPT_LIB += git-mergetool--lib
626626
SCRIPT_LIB += git-parse-remote
627-
SCRIPT_LIB += git-rebase--am
628627
SCRIPT_LIB += git-rebase--common
629628
SCRIPT_LIB += git-rebase--preserve-merges
630629
SCRIPT_LIB += git-sh-setup

builtin/rebase.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,10 +1153,6 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
11531153
}
11541154

11551155
switch (opts->type) {
1156-
case REBASE_AM:
1157-
backend = "git-rebase--am";
1158-
backend_func = "git_rebase__am";
1159-
break;
11601156
case REBASE_PRESERVE_MERGES:
11611157
backend = "git-rebase--preserve-merges";
11621158
backend_func = "git_rebase__preserve_merges";

git-rebase--am.sh

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)