diff options
| author |  Ralf Thielow <ralf.thielow@gmail.com> | 2018-09-28 21:28:49 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-09-28 14:55:12 -0700 |
| commit | 1cfc4c85b7d888c981255cff409b150abc1eed38 (patch) | |
| tree | 894246b50080d266432e658dea0b57e3bb2fc74a | |
| parent | Second batch post 2.19 (diff) | |
| download | tgif-1cfc4c85b7d888c981255cff409b150abc1eed38.tar.xz | |
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>
| -rwxr-xr-x | git-rebase.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 7973447645..45b6ee9c0e 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -553,15 +553,15 @@ then # Note: incompatibility with --interactive is just a strong warning; # git-rebase.txt caveats with "unless you know what you are doing" 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 if test -n "$rebase_merges" then 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" && - die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy'")" + die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")" fi if test -z "$rebase_root" |