Merge branch 'jc/merge-sans-branch'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 52ffbf4efb8d17c22893112208c5864d4c19741d..1d0d1b76772cf33bd6dba110fef614e2e87a5f09 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1098,6 +1098,12 @@ All gitcvs variables except for 'gitcvs.usecrlfattr' and
 is one of "ext" and "pserver") to make them apply only for the given
 access method.
 
+grep.lineNumber::
+       If set to true, enable '-n' option by default.
+
+grep.extendedRegexp::
+       If set to true, enable '--extended-regexp' option by default.
+
 gui.commitmsgwidth::
        Defines how wide the commit message window is in the
        linkgit:git-gui[1]. "75" is the default.