rebase: fix typoes in error messages

The separator between words in a multi-word option name is a dash,
not an underscore.

Inspired by a matching change by Ralf Thielow for the scripted
version of "git rebase".

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase.c b/builtin/rebase.c
index d3d1d39bfa0fd6bca3c7668a1514693b5f9f60f5..5242e01ad0c400ef2b3ae96d9e7ee1f0f150846a 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1136,15 +1136,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)
                 *       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)
                              "'--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)
                              "'--strategy-option'"));
                if (options.strategy)

-                       die(_("error: cannot combine '--rebase_merges' with "
+                       die(_("error: cannot combine '--rebase-merges' with "

                              "'--strategy'"));
        }
 
                              "'--strategy'"));
        }