diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-01-20 11:43:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-20 11:43:39 -0800 |
| commit | 52bae62f7888edf5e87ef85bbe04803474f67c10 (patch) | |
| tree | a4f85d775b4dacc8356f99de3bbfd4d33cc3269f /Documentation | |
| parent | Merge branch 'ho/gitweb-squelch-undef-warning' (diff) | |
| parent | builtin/grep: add grep.fallbackToNoIndex config (diff) | |
| download | tgif-52bae62f7888edf5e87ef85bbe04803474f67c10.tar.xz | |
Merge branch 'tg/grep-no-index-fallback'
"git grep" by default does not fall back to its "--no-index"
behaviour outside a directory under Git's control (otherwise the
user may by mistake end up running a huge recursive search); with a
new configuration (set in $HOME/.gitconfig--by definition this
cannot be set in the config file per project), this safety can be
disabled.
* tg/grep-no-index-fallback:
builtin/grep: add grep.fallbackToNoIndex config
t7810: correct --no-index test
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-grep.txt | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index beb18da143..07f7a3b771 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1454,6 +1454,10 @@ grep.threads:: Number of grep worker threads to use. See `grep.threads` in linkgit:git-grep[1] for more information. +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. + gpg.program:: Use this custom program instead of "gpg" found on $PATH when making or verifying a PGP signature. The program must support the diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 35aada1447..cb0f6cf678 100644 --- 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 ------- |