From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Feb 2020 20:42:31 +0000 (-0800)
Subject: Merge branch 'pb/do-not-recurse-grep-no-index' into maint
X-Git-Tag: v2.25.1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=153a1b46f1a4ef46cf257ed14741cb7d3e8c9ada;p=thirdparty%2Fgit.git

Merge branch 'pb/do-not-recurse-grep-no-index' into maint

"git grep --no-index" should not get affected by the contents of
the .gitmodules file but when "--recurse-submodules" is given or
the "submodule.recurse" variable is set, it did.  Now these
settings are ignored in the "--no-index" mode.

* pb/do-not-recurse-grep-no-index:
  grep: ignore --recurse-submodules if --no-index is given
---

153a1b46f1a4ef46cf257ed14741cb7d3e8c9ada