Merge branch 'gc/branch-recurse-submodules-fix'

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

diff --git a/builtin/rm.c b/builtin/rm.c
index b4132e5d8eebe5d486c9b76690f426c16ab53f58..84a935a16e8be447d0bc95ad2a1e5d133452e635 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -272,13 +272,13 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 
        if (pathspec_from_file) {
                if (pathspec.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(&pathspec, 0,
                                    PATHSPEC_PREFER_CWD,
                                    prefix, pathspec_from_file, pathspec_file_nul);
        } else if (pathspec_file_nul) {
-               die(_("--pathspec-file-nul requires --pathspec-from-file"));
+               die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
        }
 
        if (!pathspec.nr)