Merge branch 'db/vcs-svn-incremental' into svn-fe

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index d4d425ea30292d69edd6e89a78e25dbe6346ef40..d7523b3e45ff06bd7a8abf4ff466fe619c8268e7 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -31,6 +31,16 @@ Look for specified patterns in the tracked files in the work tree, blobs
 registered in the index file, or blobs in given tree objects.
 
 
+CONFIGURATION
+-------------
+
+grep.lineNumber::
+       If set to true, enable '-n' option by default.
+
+grep.extendedRegexp::
+       If set to true, enable '--extended-regexp' option by default.
+
+
 OPTIONS
 -------
 --cached::
@@ -93,6 +103,7 @@ OPTIONS
        as a regex).
 
 -n::
+--line-number::
        Prefix the line number to matching lines.
 
 -l::