summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-12 15:16:55 -0800
committerJunio C Hamano <gitster@pobox.com>2016-01-12 15:16:55 -0800
commitbdd1cc20929e9f7631dd29ff70426eea53f69443 (patch)
tree0d6baf9bff5c5a391042ab44801d144a76da43d3 /contrib
parent72d25911eb6adc450aabb741cb911bf6aa89a322 (diff)
parent89f09dd34e613394c749f69ddd74adc90cb034ca (diff)
downloadgit-bdd1cc20929e9f7631dd29ff70426eea53f69443.tar.gz
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 'contrib')
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6956807519..ab4da7f979 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1312,6 +1312,7 @@ _git_grep ()
--full-name --line-number
--extended-regexp --basic-regexp --fixed-strings
--perl-regexp
+ --threads
--files-with-matches --name-only
--files-without-match
--max-depth