[PATCH] Infamous 'octopus merge'

diff --git a/Makefile b/Makefile
index 267de67fd71c71d020c12e06452fa1270e3ba5cf..4d1c11166e9b625e3a94bafcd1efa6c321028404 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
 SCRIPTS += git-count-objects-script
 # SCRIPTS += git-send-email-script
 SCRIPTS += git-revert-script
+SCRIPTS += git-octopus-script
 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \