diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 23:42:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 23:42:31 +0300 |
| commit | 153a1b46f1a4ef46cf257ed14741cb7d3e8c9ada (patch) | |
| tree | 47873571baa2b6d320b0847ed2a494e2ba8a1e06 /Documentation | |
| parent | 8857657cc93128753bfe3708c170de63c0fcb273 (diff) | |
| parent | c56c48dd0750dc7759f5e9a33cd4a01d6162b06e (diff) | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-grep.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index c89fb569e3..ffc3a6efdc 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -96,7 +96,8 @@ OPTIONS Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of - the parent project's <tree> object. + the parent project's <tree> object. This option has no effect + if `--no-index` is given. -a:: --text:: |