Merge branch 'tr/grep-threading'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:28 +0000 (11:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:28 +0000 (11:27 -0800)
* tr/grep-threading:
grep: disable threading in non-worktree case
grep: enable threading with -p and -W using lazy attribute lookup
grep: load funcname patterns for -W

Trivial merge