X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=d7e8d2ac0d18ecbdffac989726d8eb827f35c1cd;hb=810255fd12536d296597a0366f514bf65c2e10f6;hp=328b399f9fe6e2b668691ab359319f50561cd773;hpb=7765e7ebda7e273bca34e87110be899447068b58;p=git.git

diff --git a/.gitignore b/.gitignore
index 328b399f..d7e8d2ac 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
@@ -42,7 +44,7 @@ git-index-pack
 git-init-db
 git-local-fetch
 git-log
-git-lost+found
+git-lost-found
 git-ls-files
 git-ls-remote
 git-ls-tree
@@ -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
@@ -74,9 +75,10 @@ git-read-tree
 git-rebase
 git-receive-pack
 git-relink
-git-rename
 git-repack
+git-repo-config
 git-request-pull
+git-rerere
 git-reset
 git-resolve
 git-rev-list
@@ -87,6 +89,7 @@ git-send-pack
 git-sh-setup
 git-shell
 git-shortlog
+git-show
 git-show-branch
 git-show-index
 git-ssh-fetch
@@ -120,3 +123,5 @@ git-core.spec
 *.exe
 libgit.a
 *.o
+*.py[co]
+config.mak