diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 21:02:16 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 22:29:23 +0100 |
| commit | 12909b6b8a4a51e9d2b46610be4f93c782949c80 (patch) | |
| tree | e0643769171bc1f80a17d52c7724b8fee3b21978 /builtin/rev-list.c | |
| parent | i18n: refactor "%s, %s and %s are mutually exclusive" (diff) | |
| download | git-12909b6b8a4a51e9d2b46610be4f93c782949c80.tar.xz git-12909b6b8a4a51e9d2b46610be4f93c782949c80.zip | |
i18n: turn "options are incompatible" into "cannot be used together"
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rev-list.c')
| -rw-r--r-- | builtin/rev-list.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 36cb909eba..c1a3b0b359 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -538,7 +538,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) const char *arg = argv[i]; if (skip_prefix(arg, "--missing=", &arg)) { if (revs.exclude_promisor_objects) - die(_("cannot combine --exclude-promisor-objects and --missing")); + die(_("options '%s' and '%s' cannot be used together"), "--exclude-promisor-objects", "--missing"); if (parse_missing_action_value(arg)) break; } |