X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=6bd508e4be252d5afeb24db9b4ca7f0541f895ce;hb=e99fcf96deab45ca81b22948328deb2d8586aa8d;hp=0dd7b9c7b4ab6f02fc0b73d0c92cd2520bfa032f;hpb=1331df878113037aabc496860b49ed14a762517c;p=git.git

diff --git a/.gitignore b/.gitignore
index 0dd7b9c7..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
@@ -75,6 +74,7 @@ git-rebase
 git-receive-pack
 git-relink
 git-repack
+git-repo-config
 git-request-pull
 git-reset
 git-resolve