Handle symlinks graciously

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8a6bd02..6bd508e 100644 (file)
--- 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