Merge branch 'vl/grep-configurable-threads'
commitbdd1cc20929e9f7631dd29ff70426eea53f69443
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jan 2016 23:16:55 +0000 (12 15:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jan 2016 23:16:55 +0000 (12 15:16 -0800)
tree0d6baf9bff5c5a391042ab44801d144a76da43d3
parent72d25911eb6adc450aabb741cb911bf6aa89a322
parent89f09dd34e613394c749f69ddd74adc90cb034ca
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
Documentation/config.txt
builtin/grep.c
contrib/completion/git-completion.bash