kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2018-09-28 15:03:02 -07:00
parent b361bd754d
commit f240918d2b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/rebase.c
View File

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