git-rebase.sh: fix typos in error messages
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Thielow committed
Sep 28, 2018 at 21:28 UTC
1cfc4c85b7d888c981255cff409b150abc1eed38
1 file changed
+3
-3
git-rebase.sh
+3
-3
@@ -553,15 +553,15 @@ then
553
# Note: incompatibility with --interactive is just a strong warning;
554
# git-rebase.txt caveats with "unless you know what you are doing"
555
test -n "$rebase_merges" &&
556
- die "$(gettext "error: cannot combine '--preserve_merges' with '--rebase-merges'")"
556
+ die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")"
557
fi
558
559
if test -n "$rebase_merges"
560
then
561
test -n "$strategy_opts" &&
562
- die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy-option'")"
562
+ die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")"
563
test -n "$strategy" &&
564
- die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy'")"
564
+ die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")"
565
fi
566
567
if test -z "$rebase_root"