]> git.ipfire.org Git - thirdparty/git.git/commit - git-rebase--preserve-merges.sh
rebase -i: move rebase--helper modes to rebase--interactive
authorAlban Gruin <alban.gruin@gmail.com>
Thu, 27 Sep 2018 21:56:10 +0000 (23:56 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Oct 2018 01:44:10 +0000 (10:44 +0900)
commit34b47315d9721a576b9536492cca0c11588113a2
treefd8d62c7944c08c9b35f797a75e467036e18bf27
parentcf808208ec09727d993d670619c517bdcb00ca2b
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>
.gitignore
Makefile
builtin.h
builtin/rebase--helper.c [deleted file]
builtin/rebase--interactive.c
git-rebase--preserve-merges.sh
git.c