summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-01 17:56:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-01 17:56:27 -0700
commitb966427b53b246e722df1e5502b9145eb9dd063a (patch)
tree64df791944fd20ba8c49dc5043aa25681f07e1c7 /Documentation/config.txt
parentMerge branch 'ab/i18n-st' (diff)
parentgrep: allow -E and -n to be turned on by default via configuration (diff)
downloadtgif-b966427b53b246e722df1e5502b9145eb9dd063a.tar.xz
Merge branch 'jr/grep-en-config'
* jr/grep-en-config: grep: allow -E and -n to be turned on by default via configuration
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 52ffbf4efb..1d0d1b7677 100644
--- 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.