From: Junio C Hamano <junkio@cox.net>
Date: Tue, 21 Feb 2006 08:49:38 +0000 (-0800)
Subject: Merge branch 'lt/merge-tree'
X-Git-Tag: v1.3.0-rc1~176
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8cf828b43c3c1ee6d85622d155a1b0639842f66a;hp=-c;p=git.git

Merge branch 'lt/merge-tree'

* lt/merge-tree:
  git-merge-tree: generalize the "traverse <n> trees in sync" functionality
  Handling large files with GIT
  Handling large files with GIT
---

8cf828b43c3c1ee6d85622d155a1b0639842f66a
diff --combined Makefile
index 317be3c3,80d7f28c..ccb896e8
--- a/Makefile
+++ b/Makefile
@@@ -53,8 -53,6 +53,8 @@@ all
  # Define NO_SOCKADDR_STORAGE if your platform does not have struct
  # sockaddr_storage.
  #
 +# Define NO_ICONV if your libc does not properly support iconv.
 +#
  # Define COLLISION_CHECK below if you believe that SHA1's
  # 1461501637330902918203684832716283019655932542976 hashes do not give you
  # sufficient guarantee that no collisions between objects will ever happen.
@@@ -153,7 -151,7 +153,7 @@@ PROGRAMS = 
  	git-upload-pack$X git-verify-pack$X git-write-tree$X \
  	git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
  	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
- 	git-describe$X
+ 	git-describe$X git-merge-tree$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -382,10 -380,6 +382,10 @@@ els
  endif
  endif
  
 +ifdef NO_ICONV
 +	ALL_CFLAGS += -DNO_ICONV
 +endif
 +
  ifdef PPC_SHA1
  	SHA1_HEADER = "ppc/sha1.h"
  	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o