X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=dbbef06c0a3e521f24c3a67240389ed0b4a5f572;hb=c1fe2fe4fe685e0587c3949f953aab726de88994;hp=16a8af63f0523cec82faa23f29cee579ac224e82;hpb=6d5410d65137dc76a504b550872614170e2d98b3;p=git.git

diff --git a/.gitignore b/.gitignore
index 16a8af63..dbbef06c 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
@@ -74,8 +73,8 @@ git-read-tree
 git-rebase
 git-receive-pack
 git-relink
-git-rename
 git-repack
+git-repo-config
 git-request-pull
 git-reset
 git-resolve
@@ -120,3 +119,4 @@ git-core.spec
 *.exe
 libgit.a
 *.o
+*.py[co]