summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-20 02:03:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-20 02:05:49 (GMT)
commite32faa8adbc8ba9803088e849bc26680134c853c (patch)
tree34d0211f016fa52223cbfd9101a57004ed40f6cc /Makefile
parentba922ccee7565c949b4db318e5c27997cbdbfdba (diff)
downloadgit-e32faa8adbc8ba9803088e849bc26680134c853c.zip
git-e32faa8adbc8ba9803088e849bc26680134c853c.tar.gz
git-e32faa8adbc8ba9803088e849bc26680134c853c.tar.bz2
Remove "octopus".
We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c66220c..50392ff 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \