Merge branch 'nd/grep-true-path'
commite034d1bb927c17a3406a2bdbb8ccf710677a139d
authorJeff King <peff@peff.net>
Mon, 29 Oct 2012 08:13:16 +0000 (29 04:13 -0400)
committerJeff King <peff@peff.net>
Mon, 29 Oct 2012 08:13:16 +0000 (29 04:13 -0400)
tree58bc69a25324468d97a49aeb942c938211ccd442
parent58f3f9893dc287bd5b7ec4bbd3fc56b77e126e6c
parent55c61688ea1e41f4a8c26f957bf1bc43cd39ed97
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
builtin/grep.c
grep.c
grep.h