X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile;h=45ce4221c9db032877f6f9259b35ffc07d2d6581;hb=9b1320a99e906b5e7011f5e641f7400d82bbc82f;hp=1d3a0a47aa614d4b9047f02c5752bb41d0302eea;hpb=289c4b36e336af5266b86d924ef0aa828e8e4841;p=git.git diff --git a/Makefile b/Makefile index 1d3a0a47..45ce4221 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,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)