Merge branch 'js/pull-rebase-i'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d04a669f002e908d448c361570e1fbad1778dc53..0f710ca3c2fcdfa552c15d346af6995b599b0af4 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1452,6 +1452,14 @@ grep.extendedRegexp::
        option is ignored when the 'grep.patternType' option is set to a value
        other than 'default'.
 
+grep.threads::
+       Number of grep worker threads to use.
+       See `grep.threads` in linkgit:git-grep[1] for more information.
+
+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.
+
 gpg.program::
        Use this custom program instead of "gpg" found on $PATH when
        making or verifying a PGP signature. The program must support the