Merge branch 'jc/bindiff' into next

* jc/bindiff:
  binary diff: further updates.
  binary patch.
  pack-object: squelch eye-candy on non-tty
  core.prefersymlinkrefs: use symlinks for .git/HEAD
  repo-config: trim white-space before comment
  Fix for config file section parsing.
  Clarify git-cherry documentation.
  Update git-unpack-objects documentation.
  Fix up docs where "--" isn't displayed correctly.
  Several trivial documentation touch ups.
  git-svn 1.0.0
  git-svn: documentation updates
  delta: stricter constness
  Makefile: do not link rev-list any specially.
  builtin-push: --all and --tags _are_ explicit refspecs

diff --cc Makefile
index e9d9e10,814010d..070c478
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -205,7 -205,7 +205,7 @@@ DIFF_OBJS = 
        diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
-       blob.o commit.o connect.o csum-file.o cache-tree.o \
 -      blob.o commit.o connect.o csum-file.o base85.o \
++      blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
        date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
        object.o pack-check.o patch-delta.o path.o pkt-line.o \
        quote.o read-cache.o refs.o run-command.o \

diff --cc apply.c
index acecf8d,1b93aab..88d2a32
--- 1/apply.c
--- 2/apply.c
+++ b/apply.c
@@@ -8,9 -8,9 +8,10 @@@
   */
  #include <fnmatch.h>
  #include "cache.h"
 +#include "cache-tree.h"
  #include "quote.h"
  #include "blob.h"
+ #include "delta.h"
  
  //  --check turns on checking that the working tree matches the
  //    files that are being modified, but doesn't apply the patch

diff --cc cache.h
Simple merge

diff --cc pack-objects.c
Simple merge