Merge branch 'jc/grep-untracked-exclude'
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:27:19 +0000 (20:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:27:19 +0000 (20:27 -0700)
commitefe7aecbceb7ce0ea61f320dfbfb9e8e23f60de6
treeb5dbd971fb71c05179a3d1eedacc32be84eb740a
parent463b0ea22b5b9a882e8140d0308433d8cbd0d1fe
parent9fddaf78964a835160a0b27cdac724c27aab09bf
Merge branch 'jc/grep-untracked-exclude'

* jc/grep-untracked-exclude:
  grep: fix the error message that mentions --exclude
builtin/grep.c