X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=88b89f956fc46e2e2b417efee654b48d7b12768f;hb=724b511d4fb363ebee828ba3992c831ba006444c;hp=c66220c1a674e8d8c0593c33ca320cd520684ebf;hpb=d89056c258bcf1164287c6c6d58ca53344bda0df;p=git.git

diff --git a/Makefile b/Makefile
index c66220c1..88b89f95 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ all:
 # Define USE_STDEV below if you want git to care about the underlying device
 # change being considered an inode change from the update-cache perspective.
 
-GIT_VERSION = 0.99.9.GIT
+GIT_VERSION = 1.0.GIT
 
 # CFLAGS and LDFLAGS are for the users to override from the command line.
 
@@ -89,7 +89,7 @@ SCRIPT_SH = \
 	git-cherry.sh git-clone.sh git-commit.sh \
 	git-count-objects.sh git-diff.sh git-fetch.sh \
 	git-format-patch.sh git-log.sh git-ls-remote.sh \
-	git-merge-one-file.sh git-octopus.sh git-parse-remote.sh \
+	git-merge-one-file.sh git-parse-remote.sh \
 	git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
 	git-repack.sh git-request-pull.sh git-reset.sh \
 	git-resolve.sh git-revert.sh git-sh-setup.sh git-status.sh \