From 34058dcb703c1eebf844ba2d584eba38c1afebe9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 28 Sep 2018 15:03:02 -0700 Subject: [PATCH] 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 Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index b4881ebb22..4bfba202dc 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1217,15 +1217,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'")); }