Merge branch 'bw/recurse-submodules-relative-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:07:15 +0000 (14:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:07:15 +0000 (14:07 -0700)
commit3736c925580f678f601d670983f7f6cda791d108
treed976750cdea8442fa885712354b5c1ab54d45563
parentccf680dea305e0b2bda31a29c37e40e5beb397c8
parentb2dfeb7c005b83145e9f61305658f5dac745482a
Merge branch 'bw/recurse-submodules-relative-fix'

A few commands that recently learned the "--recurse-submodule"
option misbehaved when started from a subdirectory of the
superproject.

* bw/recurse-submodules-relative-fix:
  ls-files: fix bug when recursing with relative pathspec
  ls-files: fix typo in variable name
  grep: fix bug when recursing with relative pathspec
  setup: allow for prefix to be passed to git commands
  grep: fix help text typo
builtin/grep.c
cache.h
git.c
setup.c