diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-20 05:03:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-20 05:05:49 +0300 |
| commit | e32faa8adbc8ba9803088e849bc26680134c853c (patch) | |
| tree | 34d0211f016fa52223cbfd9101a57004ed40f6cc /Makefile | |
| parent | ba922ccee7565c949b4db318e5c27997cbdbfdba (diff) | |
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-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 \ |