diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:49:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:49:38 -0800 |
| commit | 8cf828b43c3c1ee6d85622d155a1b0639842f66a (patch) | |
| tree | d3e667fc24e0db2ead60d34e28b99f4391ff8d18 /Makefile | |
| parent | 6ead3972f54e290b255b9c5379a2f9a35ec9f847 (diff) | |
| parent | 164dcb97f0cd1accaec4ed40c24881f8e9ae4371 (diff) | |
| download | git-8cf828b43c3c1ee6d85622d155a1b0639842f66a.tar.gz git-8cf828b43c3c1ee6d85622d155a1b0639842f66a.tar.xz | |
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-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |