Merge branch 'jc/grep-untracked-exclude'

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

diff --cc builtin/grep.c
Simple merge