GIT 1.1.1

[thirdparty/git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 328b399f9fe6e2b668691ab359319f50561cd773..1a9090bffc095abef71bf7a4121d69bfa4372174 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+GIT-VERSION-FILE
 git
 git-add
 git-am
@@ -42,7 +43,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 +61,6 @@ git-merge-stupid
 git-mktag
 git-name-rev
 git-mv
-git-octopus
 git-pack-redundant
 git-pack-objects
 git-parse-remote
@@ -74,8 +74,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 +120,4 @@ git-core.spec
 *.exe
 libgit.a
 *.o
+*.py[co]