diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:16:06 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:16:06 +0900 |
| commit | c63c2ff80c9e4b646301749ddd93039e99f091f6 (patch) | |
| tree | 556d428bd53efed50f32d4e3513afa19bf94706d | |
| parent | 0e6450039a26a66c0355decf2bc8b985d1621c28 (diff) | |
| parent | 1cfc4c85b7d888c981255cff409b150abc1eed38 (diff) | |
| download | git-c63c2ff80c9e4b646301749ddd93039e99f091f6.tar.gz | |
Merge branch 'rt/rebase-typofix'
Typofix.
* rt/rebase-typofix:
git-rebase.sh: fix typos in error messages
| -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" |