summaryrefslogtreecommitdiff
path: root/.gitignore
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 /.gitignore
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 '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 8a6bd02..6bd508e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,7 +60,6 @@ git-merge-stupid
git-mktag
git-name-rev
git-mv
-git-octopus
git-pack-redundant
git-pack-objects
git-parse-remote