Merge branch 'nd/grep-true-path' into maint
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)
"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

1  2 
builtin/grep.c
grep.c
grep.h

diff --cc builtin/grep.c
Simple merge
diff --cc grep.c
Simple merge
diff --cc grep.h
Simple merge