X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=6bd508e4be252d5afeb24db9b4ca7f0541f895ce;hb=e99fcf96deab45ca81b22948328deb2d8586aa8d;hp=8a6bd02d4ff1628af4c47d8c0c35d835607832d1;hpb=56fc63193975edd4b9f520b6c65c2b97ecd8ee38;p=git.git

diff --git a/.gitignore b/.gitignore
index 8a6bd02d..6bd508e4 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