diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 20:02:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 21:29:23 (GMT) |
| commit | 12909b6b8a4a51e9d2b46610be4f93c782949c80 (patch) | |
| tree | e0643769171bc1f80a17d52c7724b8fee3b21978 /builtin/commit.c | |
| parent | c488182903d97da70b7a486e514ab871345067cc (diff) | |
| download | git-12909b6b8a4a51e9d2b46610be4f93c782949c80.zip git-12909b6b8a4a51e9d2b46610be4f93c782949c80.tar.gz git-12909b6b8a4a51e9d2b46610be4f93c782949c80.tar.bz2 | |
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/commit.c')
| -rw-r--r-- | builtin/commit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 883c162..067c795 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -355,10 +355,10 @@ static const char *prepare_index(const char **argv, const char *prefix, if (pathspec_from_file) { if (interactive) - die(_("--pathspec-from-file is incompatible with --interactive/--patch")); + die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch"); if (all) - die(_("--pathspec-from-file with -a does not make sense")); + die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "-a"); if (pathspec.nr) die(_("--pathspec-from-file is incompatible with pathspec arguments")); @@ -1193,7 +1193,7 @@ static void finalize_deferred_config(struct wt_status *s) status_format == STATUS_FORMAT_UNSPECIFIED) status_format = STATUS_FORMAT_PORCELAIN; else if (status_format == STATUS_FORMAT_LONG) - die(_("--long and -z are incompatible")); + die(_("options '%s' and '%s' cannot be used together"), "--long", "-z"); } if (use_deferred_config && status_format == STATUS_FORMAT_UNSPECIFIED) |