| commit | 153a1b46f1a4ef46cf257ed14741cb7d3e8c9ada | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Feb 2020 20:42:31 +0000 (14 12:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Feb 2020 20:42:31 +0000 (14 12:42 -0800) | ||
| tree | 47873571baa2b6d320b0847ed2a494e2ba8a1e06 | treesnapshot (tar.gz zip) |
| parent | 8857657cc93128753bfe3708c170de63c0fcb273 | commitdiff |
| parent | c56c48dd0750dc7759f5e9a33cd4a01d6162b06e | commitdiff |
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
"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