X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=5382e742719be2ca7285898d70d9bf0fd367c247;hb=5ea06e2014a910240408f74b9dab2128a30fd06c;hp=8a6bd02d4ff1628af4c47d8c0c35d835607832d1;hpb=ee72aeaf009417156a3599b0eb69da3f7023ca07;p=git.git

diff --git a/.gitignore b/.gitignore
index 8a6bd02d..5382e742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+GIT-VERSION-FILE
 git
 git-add
 git-am
@@ -27,6 +28,7 @@ git-diff-files
 git-diff-index
 git-diff-stages
 git-diff-tree
+git-describe
 git-fetch
 git-fetch-pack
 git-findtags
@@ -60,7 +62,6 @@ git-merge-stupid
 git-mktag
 git-name-rev
 git-mv
-git-octopus
 git-pack-redundant
 git-pack-objects
 git-parse-remote
@@ -120,3 +121,4 @@ git-core.spec
 *.exe
 libgit.a
 *.o
+*.py[co]