Skip to content

Commit bda7d60

Browse files
committed
Revert "Merge branch 'interactive-rebase'"
Prepare for the current interactive-rebase patch thicket, backported to `maint` (actually, our latest start of a merging rebase). This reverts commit b358f8d, reversing changes made to 9e699f5. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 579907a commit bda7d60

12 files changed

+384
-1654
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
/git-read-tree
116116
/git-rebase
117117
/git-rebase--am
118-
/git-rebase--helper
119118
/git-rebase--interactive
120119
/git-rebase--merge
121120
/git-receive-pack

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,6 @@ BUILTIN_OBJS += builtin/prune.o
931931
BUILTIN_OBJS += builtin/pull.o
932932
BUILTIN_OBJS += builtin/push.o
933933
BUILTIN_OBJS += builtin/read-tree.o
934-
BUILTIN_OBJS += builtin/rebase--helper.o
935934
BUILTIN_OBJS += builtin/receive-pack.o
936935
BUILTIN_OBJS += builtin/reflog.o
937936
BUILTIN_OBJS += builtin/remote.o

builtin.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
103103
extern int cmd_pull(int argc, const char **argv, const char *prefix);
104104
extern int cmd_push(int argc, const char **argv, const char *prefix);
105105
extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
106-
extern int cmd_rebase__helper(int argc, const char **argv, const char *prefix);
107106
extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
108107
extern int cmd_reflog(int argc, const char **argv, const char *prefix);
109108
extern int cmd_remote(int argc, const char **argv, const char *prefix);

builtin/rebase--helper.c

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

0 commit comments

Comments
 (0)