Use symbolic name SHORT_NAME_AMBIGUOUS as error return value

[thirdparty/git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 716c340a22ceb4ddc6f69b369ef3c14b4f6deeaa..5382e742719be2ca7285898d70d9bf0fd367c247 100644 (file)
--- 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,6 +44,7 @@ git-index-pack
 git-init-db
 git-local-fetch
 git-log
+git-lost-found
 git-ls-files
 git-ls-remote
 git-ls-tree
@@ -59,7 +62,7 @@ git-merge-stupid
 git-mktag
 git-name-rev
 git-mv
-git-octopus
+git-pack-redundant
 git-pack-objects
 git-parse-remote
 git-patch-id
@@ -72,8 +75,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
@@ -118,3 +121,4 @@ git-core.spec
 *.exe
 libgit.a
 *.o
+*.py[co]