| commit | 1c7d3207520a4ffdc2a5f0df582f3a6b99af7edc | |
| author | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 11:15:35 +0000 (25 07:15 -0400) | ||
| committer | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 11:15:35 +0000 (25 07:15 -0400) | ||
| tree | 577952a0c7c0d501fa51b28ae36ba1ec50223fe8 | treesnapshot (tar.gz zip) |
| parent | 59d3687b49290d5219ae6ff9857379e7e6c86fa4 | commitdiff |
| parent | 55c61688ea1e41f4a8c26f957bf1bc43cd39ed97 | commitdiff |
Merge branch 'nd/grep-true-path' into next
"git grep -e pattern <tree>" asked the attribute system to read
"<tree>:.gitattributes" file in the working tree, which was
nonsense.
Will merge to 'master' in the second batch after 1.8.0 ships.
* nd/grep-true-path:
grep: stop looking at random places for .gitattributes
"git grep -e pattern <tree>" asked the attribute system to read
"<tree>:.gitattributes" file in the working tree, which was
nonsense.
Will merge to 'master' in the second batch after 1.8.0 ships.
* nd/grep-true-path:
grep: stop looking at random places for .gitattributes
| builtin/grep.c | diff1 | diff2 | blobhistory |
| grep.c | diff1 | diff2 | blobhistory |
| grep.h | diff1 | diff2 | blobhistory |