From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jan 2013 16:52:53 +0000 (-0800)
Subject: Merge branch 'nd/magic-pathspec-from-root'
X-Git-Tag: v1.8.2-rc0~75
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/7b5196909c7773a3ce6d3cd0ba78f42249bf27c3

Merge branch 'nd/magic-pathspec-from-root'

When giving arguments without "--" disambiguation, object names
that come  earlier on the command line must not be interpretable as
pathspecs and pathspecs that come later on the command line must
not be interpretable as object names.  Tweak the disambiguation
rule so that ":/" (no other string before or after) is always
interpreted as a pathspec, to avoid having to say "git cmd -- :/".

* nd/magic-pathspec-from-root:
  grep: avoid accepting ambiguous revision
  Update :/abc ambiguity check
---

7b5196909c7773a3ce6d3cd0ba78f42249bf27c3