diff options
author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-31 22:07:46 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-02-04 13:58:28 -0800 |
commit | a699367bb8749a338aefb092c5d7ac75c69d61e1 (patch) | |
tree | c09bbd28e122a8a2b718fed0c41fbecd743ad8cf /builtin/merge-base.c | |
parent | 5d01301f2b865aa8dba1654d3f447ce9d21db0b5 (diff) | |
download | git-a699367bb8749a338aefb092c5d7ac75c69d61e1.tar.gz |
i18n: factorize more 'incompatible options' messages
Find more incompatible options to factorize.
When more than two options are mutually exclusive, print the ones
which are actually on the command line.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-base.c')
-rw-r--r-- | builtin/merge-base.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/merge-base.c b/builtin/merge-base.c index 6719ac198d..26b84980db 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -159,12 +159,14 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix) if (argc < 2) usage_with_options(merge_base_usage, options); if (show_all) - die("--is-ancestor cannot be used with --all"); + die(_("options '%s' and '%s' cannot be used together"), + "--is-ancestor", "--all"); return handle_is_ancestor(argc, argv); } if (cmdmode == 'r' && show_all) - die("--independent cannot be used with --all"); + die(_("options '%s' and '%s' cannot be used together"), + "--independent", "--all"); if (cmdmode == 'o') return handle_octopus(argc, argv, show_all); |