summaryrefslogtreecommitdiff
path: root/Documentation/git-grep.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-20 11:43:38 -0800
committerJunio C Hamano <gitster@pobox.com>2016-01-20 11:43:39 -0800
commit52bae62f7888edf5e87ef85bbe04803474f67c10 (patch)
treea4f85d775b4dacc8356f99de3bbfd4d33cc3269f /Documentation/git-grep.txt
parent569ff48deb0d36f9e80c4d03d78e8b507820dc57 (diff)
parentecd9ba61778e436dde12f08781a12ad1149d5ebf (diff)
downloadgit-52bae62f7888edf5e87ef85bbe04803474f67c10.tar.gz
Merge branch 'tg/grep-no-index-fallback'
"git grep" by default does not fall back to its "--no-index" behaviour outside a directory under Git's control (otherwise the user may by mistake end up running a huge recursive search); with a new configuration (set in $HOME/.gitconfig--by definition this cannot be set in the config file per project), this safety can be disabled. * tg/grep-no-index-fallback: builtin/grep: add grep.fallbackToNoIndex config t7810: correct --no-index test
Diffstat (limited to 'Documentation/git-grep.txt')
-rw-r--r--Documentation/git-grep.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 35aada1447..cb0f6cf678 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -61,6 +61,10 @@ grep.threads::
grep.fullName::
If set to true, enable '--full-name' option by default.
+grep.fallbackToNoIndex::
+ If set to true, fall back to git grep --no-index if git grep
+ is executed outside of a git repository. Defaults to false.
+
OPTIONS
-------