Merge branch 'master' into sp/gfi

diff --git a/Makefile b/Makefile
index 91bd665725ddb8675df755450c441f34efc98ae4..a00c5ab42690aebff8d15d3391928f42d24d852d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
 PROGRAMS = \
        git-convert-objects$X git-fetch-pack$X git-fsck$X \
        git-hash-object$X git-index-pack$X git-local-fetch$X \
+       git-fast-import$X \
        git-merge-base$X \
        git-daemon$X \
        git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \