diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-28 15:03:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-11 14:21:08 +0900 |
| commit | f240918d2b71a9b67790d161d015ee72afd78d0e (patch) | |
| tree | 630f8afc10276bc065d128d761a38e6fa5b140db | |
| parent | b361bd754d141ef1010286dbe5fe810992a498a0 (diff) | |
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>
| -rw-r--r-- | builtin/rebase.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index d3d1d39bfa..5242e01ad0 100644 --- 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) - 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'")); } |