diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:56:27 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:56:27 -0700 |
commit | b966427b53b246e722df1e5502b9145eb9dd063a (patch) | |
tree | 64df791944fd20ba8c49dc5043aa25681f07e1c7 /Documentation | |
parent | 6c80cd298a9f2f36ae4e741cf65d94b7c184fb82 (diff) | |
parent | b22520a37c8472751f2c4b3da9b5bc4e5aa5a0a3 (diff) | |
download | git-b966427b53b246e722df1e5502b9145eb9dd063a.tar.gz |
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')
-rw-r--r-- | Documentation/config.txt | 6 | ||||
-rw-r--r-- | Documentation/git-grep.txt | 10 |
2 files changed, 16 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. diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 132505eb4f..d7523b3e45 100644 --- 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:: |