summaryrefslogtreecommitdiff
path: root/builtin/stash.c
diff options
context:
space:
mode:
authorJean-Noël Avila <jn.avila@free.fr>2022-01-05 20:02:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-01-05 21:31:00 (GMT)
commit246cac85055f513626159e8cd20b741eaf5f9f97 (patch)
treee6d7e00c0918636199eb430e98ecc62e8980ded7 /builtin/stash.c
parentd7d30badbf1ece9c944e41bac4d8aef1117e8b7f (diff)
downloadgit-246cac85055f513626159e8cd20b741eaf5f9f97.zip
git-246cac85055f513626159e8cd20b741eaf5f9f97.tar.gz
git-246cac85055f513626159e8cd20b741eaf5f9f97.tar.bz2
i18n: turn even more messages into "cannot be used together" ones
Even if some of these messages are not subject to gettext i18n, this helps bring a single style of message for a given error type. 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/stash.c')
-rw-r--r--builtin/stash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/stash.c b/builtin/stash.c
index 3e3743f..7b1876b 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -1706,7 +1706,7 @@ static int push_stash(int argc, const char **argv, const char *prefix,
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--staged");
if (ps.nr)
- die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+ die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
parse_pathspec_file(&ps, 0,
PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,