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