From: Junio C Hamano <junkio@cox.net>
Date: Fri, 5 May 2006 22:36:04 +0000 (-0700)
Subject: Merge branch 'jc/bindiff' into next
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2749fa7771f2a4323b48b78fa194a90d611bc2d8;p=git.git

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
---

2749fa7771f2a4323b48b78fa194a90d611bc2d8
diff --cc Makefile
index e9d9e101,814010d7..070c478b
--- a/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 acecf8de,1b93aab8..88d2a320
--- a/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