Merge branch 'jc/symref'

* jc/symref:
  core.prefersymlinkrefs: use symlinks for .git/HEAD

diff --combined Makefile
index c0d444b,cb6bb72..fea20cc
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -28,8 -28,8 +28,8 @@@ all
  #
  # Define NO_SETENV if you don't have setenv in the C library.
  #
- # Define USE_SYMLINK_HEAD if you want .git/HEAD to be a symbolic link.
- # Don't enable it on Windows.
+ # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
+ # Enable it on Windows.  By default, symrefs are still used.
  #
  # Define PPC_SHA1 environment variable when running make to make use of
  # a bundled SHA1 routine optimized for PowerPC.
@@@ -115,10 -115,10 +115,10 @@@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__pow
  SCRIPT_SH = \
        git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
        git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
 -      git-count-objects.sh git-diff.sh git-fetch.sh \
 +      git-fetch.sh \
        git-format-patch.sh git-ls-remote.sh \
        git-merge-one-file.sh git-parse-remote.sh \
 -      git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
 +      git-prune.sh git-pull.sh git-rebase.sh \
        git-repack.sh git-request-pull.sh git-reset.sh \
        git-resolve.sh git-revert.sh git-rm.sh git-sh-setup.sh \
        git-tag.sh git-verify-tag.sh git-whatchanged.sh \
@@@ -167,8 -167,7 +167,8 @@@ PROGRAMS = 
        git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
        git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
  
 -BUILT_INS = git-log$X
 +BUILT_INS = git-log$X \
 +      git-count-objects$X git-diff$X git-push$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -215,7 -214,7 +215,7 @@@ LIB_OBJS = 
        $(DIFF_OBJS)
  
  BUILTIN_OBJS = \
 -      builtin-log.o builtin-help.o
 +      builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -264,6 -263,7 +264,7 @@@ ifeq ($(uname_O),Cygwin
        NO_D_TYPE_IN_DIRENT = YesPlease
        NO_D_INO_IN_DIRENT = YesPlease
        NO_STRCASESTR = YesPlease
+       NO_SYMLINK_HEAD = YesPlease
        NEEDS_LIBICONV = YesPlease
        # There are conflicting reports about this.
        # On some boxes NO_MMAP is needed, and not so elsewhere.
@@@ -387,6 -387,9 +388,9 @@@ endi
  ifdef NO_D_INO_IN_DIRENT
        ALL_CFLAGS += -DNO_D_INO_IN_DIRENT
  endif
+ ifdef NO_SYMLINK_HEAD
+       ALL_CFLAGS += -DNO_SYMLINK_HEAD
+ endif
  ifdef NO_STRCASESTR
        COMPAT_CFLAGS += -DNO_STRCASESTR
        COMPAT_OBJS += compat/strcasestr.o