Code

Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:26:52 +0000 (20:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:26:52 +0000 (20:26 -0700)
commit9fddaf78964a835160a0b27cdac724c27aab09bf
treebc7d01f3fc383385b11f8931beaf2a114eab9620
parentdbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c
parent92e61831fb2c8d5b874405906510230fd0f10998
Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

* jc/maint-grep-untracked-exclude:
  grep: fix the error message that mentions --exclude

Conflicts:
builtin/grep.c
builtin/grep.c