Merge branch 'bw/grep-no-index-no-exclude'

* bw/grep-no-index-no-exclude: grep --no-index: don't use git standard exclusions grep: do not use --index in the short usage output