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

Merge branch 'jc/rebase-in-c-5-test-typofix' 

Typofix.

* jc/rebase-in-c-5-test-typofix:
  rebase: fix typoes in error messages
maint
Junio C Hamano 2018-11-02 11:04:57 +09:00
parent ee5e90434e f240918d2b
commit 7ce32f72e3
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

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