Merge branch 'rs/grep-function-context'

* rs/grep-function-context:
  grep: long context options
  grep: add option to show whole function as context

diff --cc Documentation/git-grep.txt
Simple merge