From: Junio C Hamano Date: Wed, 12 Feb 2020 20:41:36 +0000 (-0800) Subject: Merge branch 'pb/do-not-recurse-grep-no-index' X-Git-Tag: v2.26.0-rc0~80 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=556ccd4dd2943009270b46b9af443a396bff4dfc;p=thirdparty%2Fgit.git Merge branch 'pb/do-not-recurse-grep-no-index' "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 --- 556ccd4dd2943009270b46b9af443a396bff4dfc