Merge branch 'js/grep-patterntype-config'

"grep" learned to use a non-standard pattern type by default if a
configuration variable tells it to.

* js/grep-patterntype-config:
  grep: add a grep.patternType configuration setting

diff --cc Documentation/config.txt
Simple merge

diff --cc t/t7810-grep.sh
Simple merge