i18n: turn "options are incompatible" into "cannot be used together"

[thirdparty/git.git] / builtin / commit.c

diff --git a/builtin/commit.c b/builtin/commit.c
index 883c16256c87f75c8367573ba42a8ee8e04346a7..067c795ca4b7db8c8d1e4854e6e6165dceafc60e 100644 (file)
--- 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)