summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorAlban Gruin <alban.gruin@gmail.com>2018-09-27 23:56:10 +0200
committerJunio C Hamano <gitster@pobox.com>2018-10-09 10:44:10 +0900
commit34b47315d9721a576b9536492cca0c11588113a2 (patch)
treefd8d62c7944c08c9b35f797a75e467036e18bf27 /builtin.h
parentcf808208ec09727d993d670619c517bdcb00ca2b (diff)
downloadgit-34b47315d9721a576b9536492cca0c11588113a2.tar.gz
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 'builtin.h')
-rw-r--r--builtin.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin.h b/builtin.h
index ed89b4f495..7feb689d87 100644
--- a/builtin.h
+++ b/builtin.h
@@ -203,7 +203,6 @@ extern int cmd_pull(int argc, const char **argv, const char *prefix);
extern int cmd_push(int argc, const char **argv, const char *prefix);
extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
extern int cmd_rebase__interactive(int argc, const char **argv, const char *prefix);
-extern int cmd_rebase__helper(int argc, const char **argv, const char *prefix);
extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
extern int cmd_reflog(int argc, const char **argv, const char *prefix);
extern int cmd_remote(int argc, const char **argv, const char *prefix);