From: Junio C Hamano Date: Tue, 12 Jan 2016 23:16:55 +0000 (-0800) Subject: Merge branch 'vl/grep-configurable-threads' X-Git-Tag: v2.8.0-rc0~125 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bdd1cc20929e9f7631dd29ff70426eea53f69443 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= option and grep.threads configuration grep: slight refactoring to the code that disables threading grep: allow threading even on a single-core machine --- bdd1cc20929e9f7631dd29ff70426eea53f69443