diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:04:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:04:57 +0900 |
| commit | 7ce32f72e3eb0d82ead82d748f10cbd0d0c4066c (patch) | |
| tree | 1651e6689be15266e9e93a25d29cef44c2cd9ba5 | |
| parent | Merge branch 'pk/rebase-in-c-6-final' (diff) | |
| parent | rebase: fix typoes in error messages (diff) | |
| download | tgif-7ce32f72e3eb0d82ead82d748f10cbd0d0c4066c.tar.xz | |
Merge branch 'jc/rebase-in-c-5-test-typofix'
Typofix.
* jc/rebase-in-c-5-test-typofix:
rebase: fix typoes in error messages
| -rw-r--r-- | builtin/rebase.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index f1355efee7..313a8263df 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1216,15 +1216,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) * git-rebase.txt caveats with "unless you know what you are doing" */ if (options.rebase_merges) - die(_("error: cannot combine '--preserve_merges' with " + die(_("error: cannot combine '--preserve-merges' with " "'--rebase-merges'")); if (options.rebase_merges) { if (strategy_options.nr) - die(_("error: cannot combine '--rebase_merges' with " + die(_("error: cannot combine '--rebase-merges' with " "'--strategy-option'")); if (options.strategy) - die(_("error: cannot combine '--rebase_merges' with " + die(_("error: cannot combine '--rebase-merges' with " "'--strategy'")); } |