Merge branch 'mk/grep-max-depth'

* mk/grep-max-depth:
  grep: Add --max-depth option.

diff --cc contrib/completion/git-completion.bash
Simple merge