Merge branch 'nd/grep-true-path' into maint
commitdca5ed5f5b2646186ce177bb41974035f8fefd52
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:32:30 +0000 (18 19:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:32:30 +0000 (18 19:32 -0800)
treed1289a994fbcc01b35c7cf058878fb92c110831f
parent4607a8ce68f4e407bcaaf04819713b40dffce385
parent55c61688ea1e41f4a8c26f957bf1bc43cd39ed97
Merge branch 'nd/grep-true-path' into maint

"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