From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2018 02:04:57 +0000 (+0900)
Subject: Merge branch 'jc/rebase-in-c-5-test-typofix'
X-Git-Tag: v2.20.0-rc0~87
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7ce32f72e3eb0d82ead82d748f10cbd0d0c4066c?hp=ee5e90434e2c3b221b11672eb09044a91d75a524

Merge branch 'jc/rebase-in-c-5-test-typofix'

Typofix.

* jc/rebase-in-c-5-test-typofix:
rebase: fix typoes in error messages
---

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'"));
 	}