diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-12 15:16:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-12 15:16:55 -0800 |
| commit | bdd1cc20929e9f7631dd29ff70426eea53f69443 (patch) | |
| tree | 0d6baf9bff5c5a391042ab44801d144a76da43d3 /Documentation/config.txt | |
| parent | 72d25911eb6adc450aabb741cb911bf6aa89a322 (diff) | |
| parent | 89f09dd34e613394c749f69ddd74adc90cb034ca (diff) | |
| download | git-bdd1cc20929e9f7631dd29ff70426eea53f69443.tar.gz git-bdd1cc20929e9f7631dd29ff70426eea53f69443.tar.xz | |
Merge branch 'vl/grep-configurable-threads'
"git grep" can now be configured (or told from the command line)
how many threads to use when searching in the working tree files.
* vl/grep-configurable-threads:
grep: add --threads=<num> option and grep.threads configuration
grep: slight refactoring to the code that disables threading
grep: allow threading even on a single-core machine
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f61788668..beb18da14 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1450,6 +1450,10 @@ grep.extendedRegexp:: option is ignored when the 'grep.patternType' option is set to a value other than 'default'. +grep.threads:: + Number of grep worker threads to use. + See `grep.threads` in linkgit:git-grep[1] for more information. + gpg.program:: Use this custom program instead of "gpg" found on $PATH when making or verifying a PGP signature. The program must support the |