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>
Junio C Hamano committed
Sep 28, 2018 at 15:03 UTC
f240918d2b71a9b67790d161d015ee72afd78d0e
1 file changed
+3
-3
builtin/rebase.c
+3
-3
@@ -1136,15 +1136,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1136
* git-rebase.txt caveats with "unless you know what you are doing"
1137
*/
1138
if (options.rebase_merges)
1139
- die(_("error: cannot combine '--preserve_merges' with "
1139
+ die(_("error: cannot combine '--preserve-merges' with "
1140
"'--rebase-merges'"));
1141
1142
if (options.rebase_merges) {
1143
if (strategy_options.nr)
1144
- die(_("error: cannot combine '--rebase_merges' with "
1144
+ die(_("error: cannot combine '--rebase-merges' with "
1145
"'--strategy-option'"));
1146
if (options.strategy)
1147
- die(_("error: cannot combine '--rebase_merges' with "
1147
+ die(_("error: cannot combine '--rebase-merges' with "
1148
"'--strategy'"));
1149
}
1150