From: Jeff King <peff@peff.net>
Date: Mon, 29 Oct 2012 08:13:16 +0000 (-0400)
Subject: Merge branch 'nd/grep-true-path'
X-Git-Tag: v1.8.1-rc0~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e034d1bb927c17a3406a2bdbb8ccf710677a139d;p=thirdparty%2Fgit.git

Merge branch 'nd/grep-true-path'

"git grep -e pattern <tree>" asked the attribute system to read
"<tree>:.gitattributes" file in the working tree, which was
nonsense.

* nd/grep-true-path:
  grep: stop looking at random places for .gitattributes
---

e034d1bb927c17a3406a2bdbb8ccf710677a139d