Merge branch 'jr/grep-en-config'

* jr/grep-en-config:
  grep: allow -E and -n to be turned on by default via configuration

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/grep.c
Simple merge