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 f1355efee7a023b0080c4b952c7206f4db14b0c9..313a8263dfc476fa7f6a8d8379fab0965ec5ca1f 100644 (file)
--- 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'"));
        }