summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-21 08:49:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-21 08:49:38 (GMT)
commit8cf828b43c3c1ee6d85622d155a1b0639842f66a (patch)
treed3e667fc24e0db2ead60d34e28b99f4391ff8d18 /Makefile
parent6ead3972f54e290b255b9c5379a2f9a35ec9f847 (diff)
parent164dcb97f0cd1accaec4ed40c24881f8e9ae4371 (diff)
downloadgit-8cf828b43c3c1ee6d85622d155a1b0639842f66a.zip
git-8cf828b43c3c1ee6d85622d155a1b0639842f66a.tar.gz
git-8cf828b43c3c1ee6d85622d155a1b0639842f66a.tar.bz2
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 317be3c..ccb896e 100644
--- a/Makefile
+++ b/Makefile
@@ -153,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)