Merge branch 'ae/pack-autothread'

* ae/pack-autothread:
Revert "pack-objects: Print a message describing the number of threads for packing"
pack-objects: Print a message describing the number of threads for packing
pack-objects: Add runtime detection of online CPU's

diff --combined Documentation/config.txt
index fb6dae0cc2d399821c708c77904565e00ff2eb39,62b697c087e90a182544f05532aac38255c3839a..0c0bd3b0ebdf8e7161da7886a2eeedc73ee12d26
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -353,10 -353,6 +353,10 @@@ core.whitespace:
    error (enabled by default).
  * `indent-with-non-tab` treats a line that is indented with 8 or more
    space characters as an error (not enabled by default).
 +* `cr-at-eol` treats a carriage-return at the end of line as
 +  part of the line terminator, i.e. with it, `trailing-space`
 +  does not trigger if the character before such a carriage-return
 +  is not a whitespace (not enabled by default).
  
  alias.*::
        Command aliases for the linkgit:git[1] command wrapper - e.g.
@@@ -812,6 -808,8 +812,8 @@@ pack.threads:
        warning. This is meant to reduce packing time on multiprocessor
        machines. The required amount of memory for the delta search window
        is however multiplied by the number of threads.
+       Specifying 0 will cause git to auto-detect the number of CPU's
+       and set the number of threads accordingly.
  
  pack.indexVersion::
        Specify the default pack index version.  Valid values are 1 for

diff --combined Makefile
index a055f11aa65a89489344fc9b80332c0669a2549e,2dc82476e577248150a23a6d55dafddfc02ecfca..cc635296a379292f325d61f4cf4488c0239ab2fa
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -741,6 -741,7 +741,7 @@@ endi
  ifdef THREADED_DELTA_SEARCH
        BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
        EXTLIBS += -lpthread
+       LIB_OBJS += thread-utils.o
  endif
  
  ifeq ($(TCLTK_PATH),)
@@@ -1102,7 -1103,7 +1103,7 @@@ git.spec: git.spec.i
        mv $@+ $@
  
  GIT_TARNAME=git-$(GIT_VERSION)
 -dist: git.spec git-archive configure
 +dist: git.spec git-archive$(X) configure
        ./git-archive --format=tar \
                --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
        @mkdir -p $(GIT_TARNAME)