From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Sep 2012 22:24:21 +0000 (-0700)
Subject: Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11
X-Git-Tag: v1.7.11.6~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f9d8e3572e507fec9047fbfc216821d23b42881;p=git.git

Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11

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
---

5f9d8e3572e507fec9047fbfc216821d23b42881