Merge branch 'mm/die-with-dashdash-help'

When the user gives an argument that can be taken as both a revision
name and a pathname without disambiguating with "--", we used to
give a help message "Use '--' to separate".  The message has been
clarified to show where that '--' goes on the command line.

* mm/die-with-dashdash-help:
  setup: clarify error messages for file/revisions ambiguity

diff --cc setup.c
index 9139beefc75c4fe92cf8c7dc54a9fae972995aca,7663a4cbb2e3d179c3a16d647733da7bf89a3e2d..3a1b2fd45580cad7ecd55efa755872efc81075ad
--- 1/setup.c
--- 2/setup.c
+++ b/setup.c
@@@ -77,9 -77,12 +77,9 @@@ static void NORETURN die_verify_filenam
                                         const char *arg,
                                         int diagnose_misspelt_rev)
  {
 -      unsigned char sha1[20];
 -      unsigned mode;
 -
        if (!diagnose_misspelt_rev)
                die("%s: no such path in the working tree.\n"
-                   "Use '-- <path>...' to specify paths that do not exist locally.",
+                   "Use 'git <command> -- <path>...' to specify paths that do not exist locally.",
                    arg);
        /*
         * Saying "'(icase)foo' does not exist in the index" when the