rebase -p: error out if --signoff is given
rebase --preserve-merges does not support --signoff so error out rather than just silently ignoring it so that the user knows the commits will not be signed off. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Mar 20, 2018 at 11:10 UTC
b79966aa386fc58801e93496cd4e97d82acd53a5
1 file changed
+2
git-rebase.sh
+2
@@ -472,6 +472,8 @@ fi
472
473
if test -n "$signoff"
474
then
475
+ test -n "$preserve_merges" &&
476
+ die "$(gettext "error: cannot combine '--signoff' with '--preserve-merges'")"
477
git_am_opt="$git_am_opt $signoff"
478
force_rebase=t
479
fi