]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/rebase.c
builtin rebase: support `keep-empty` option
authorPratik Karki <predatoramigo@gmail.com>
Tue, 4 Sep 2018 21:59:57 +0000 (14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Sep 2018 18:56:20 +0000 (11:56 -0700)
commit002ee2fe68258e5a4c6dfa93b1c46cf3318b5342
tree77e2477e507fabf8b1158dc130c3605a3b3e9c81
parent53f9e5be94e64e10114e521dd2389495baaeb00d
builtin rebase: support `keep-empty` option

The `--keep-empty` option can be used to keep the commits that do not
change anything from its parents in the result.

While the scripted version uses `interactive_rebase=implied` to indicate
that the rebase needs to use the `git-rebase--interactive` backend in
non-interactive mode as fallback when figuring out which backend to use,
the C version needs to use a different route because the backend will
already be chosen during the `parse_options()` call.

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c