Merge branch 'dm/make-threaded-simplify'

* dm/make-threaded-simplify:
  Make NO_PTHREADS the sole thread configuration variable

diff --combined Documentation/RelNotes-1.7.0.txt
index f33e85da941963ce1b55aef4f01e152e174b87ea,45ac9067f0fea82c69b8a38d174e462e2e89eb9c..7ed6a3af2e97c8884b9758408a46b2962d87e663
--- 1/Documentation/RelNotes-1.7.0.txt
--- 2/Documentation/RelNotes-1.7.0.txt
+++ b/Documentation/RelNotes-1.7.0.txt
@@@ -38,13 -38,6 +38,13 @@@ Notes on behaviour chang
     whitespaces is reported with zero exit status when run with
     --exit-code, and there is no "diff --git" header for such a change.
  
 + * external diff and textconv helpers are now executed using the shell.
 +   This makes them consistent with other programs executed by git, and
 +   allows you to pass command-line parameters to the helpers. Any helper
 +   paths containing spaces or other metacharacters now need to be
 +   shell-quoted.  The affected helpers are GIT_EXTERNAL_DIFF in the
 +   environment, and diff.*.command and diff.*.textconv in the config
 +   file.
  
  Updates since v1.6.6
  --------------------
@@@ -182,6 -175,9 +182,9 @@@
  
   * Many more commands are now built-in.
  
+  * THREADED_DELTA_SEARCH is no more.  If you build with threads, delta
+    compression will always take advantage of it.
+ 
  Fixes since v1.6.6
  ------------------