Merge branch 'bw/grep-recurse-submodules' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:14:31 +0000 (15:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:14:31 +0000 (15:14 -0700)
commita57e2f01291f56668e2097f3996fb96227c1a5a0
treee76331d3cd8de77925e29f09fee9f11f8d63d6d8
parentab5fba24ee0096b15bf4e814f5ebf1f0cc20c7a5
parent2225e1ea20481a7c0da526891470abf9ece623e7
Merge branch 'bw/grep-recurse-submodules' into next

Build fix for NO_PTHREADS build.

* bw/grep-recurse-submodules:
  grep: fix builds with with no thread support
  grep: set default output method
builtin/grep.c