summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorAlban Gruin <alban.gruin@gmail.com>2018-09-27 21:56:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-09 01:44:10 (GMT)
commit34b47315d9721a576b9536492cca0c11588113a2 (patch)
treefd8d62c7944c08c9b35f797a75e467036e18bf27 /git.c
parentcf808208ec09727d993d670619c517bdcb00ca2b (diff)
downloadgit-34b47315d9721a576b9536492cca0c11588113a2.zip
git-34b47315d9721a576b9536492cca0c11588113a2.tar.gz
git-34b47315d9721a576b9536492cca0c11588113a2.tar.bz2
rebase -i: move rebase--helper modes to rebase--interactive
This moves the rebase--helper modes still used by git-rebase--preserve-merges.sh (`--shorten-ids`, `--expand-ids`, `--check-todo-list`, `--rearrange-squash` and `--add-exec-commands`) to rebase--interactive.c. git-rebase--preserve-merges.sh is modified accordingly, and rebase--helper.c is removed as it is useless now. Signed-off-by: Alban Gruin <alban.gruin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r--git.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/git.c b/git.c
index 19d0b6e..81aabd1 100644
--- a/git.c
+++ b/git.c
@@ -519,7 +519,6 @@ static struct cmd_struct commands[] = {
{ "push", cmd_push, RUN_SETUP },
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
{ "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
- { "rebase--helper", cmd_rebase__helper, RUN_SETUP | NEED_WORK_TREE },
{ "receive-pack", cmd_receive_pack },
{ "reflog", cmd_reflog, RUN_SETUP },
{ "remote", cmd_remote, RUN_SETUP },