Merge branch 'sk/gitweb-highlight-encoding' into HEAD

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 35aada1447d5276910393b7a29a7ef10ab2d0c3e..cb0f6cf6782c87d7a5b08e2b75de5b4ecb2969f9 100644 (file)
--- 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
 -------