Merge branch 'rs/git-dir-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Sat, 13 Feb 2010 23:09:33 +0000 (15:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 13 Feb 2010 23:09:33 +0000 (15:09 -0800)
commit263830c47b0ddd3440fbc87a841499fe699a50b1
tree4ee0c997ed1f94de2f2f6d36baf25f153242d66e
parent67eb5383dd1dac653855ef0a90364fdc5cfdce6a
parent59332d13b2b23840452180368914921bffe9bfbc
Merge branch 'rs/git-dir-cleanup'

* rs/git-dir-cleanup:
  Resurrect "git grep --no-index"
  setenv(GIT_DIR) clean-up

Conflicts:
builtin-grep.c
t/t7002-grep.sh
builtin-grep.c
t/t7002-grep.sh