undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-rebase.sh: fix typos in error messages

Browse Source 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ralf Thielow 2018-09-28 21:28:49 +02:00 committed by Junio C Hamano
parent fe8321ec05
commit 1cfc4c85b7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-rebase.sh
View File

@ -553,15 +553,15 @@ then
# Note: incompatibility with --interactive is just a strong warning; # Note: incompatibility with --interactive is just a strong warning;
# git-rebase.txt caveats with "unless you know what you are doing" # git-rebase.txt caveats with "unless you know what you are doing"
test -n "$rebase_merges" && test -n "$rebase_merges" &&
die "$(gettext "error: cannot combine '--preserve_merges' with '--rebase-merges'")" die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")"
fi fi
if test -n "$rebase_merges" if test -n "$rebase_merges"
then then
test -n "$strategy_opts" && test -n "$strategy_opts" &&
die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy-option'")" die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")"
test -n "$strategy" && test -n "$strategy" &&
die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy'")" die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")"
fi fi
if test -z "$rebase_root" if test -z "$rebase_root"