X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=5382e742719be2ca7285898d70d9bf0fd367c247;hb=5ea06e2014a910240408f74b9dab2128a30fd06c;hp=52cb9e2c08ce3b77d9a39e461b410759bfe402f0;hpb=4eba0f3763e2f4bbf614c99ae3a5b299e8d61aff;p=git.git

diff --git a/.gitignore b/.gitignore
index 52cb9e2c..5382e742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+GIT-VERSION-FILE
 git
 git-add
 git-am
@@ -19,6 +20,7 @@ git-commit
 git-commit-tree
 git-convert-objects
 git-count-objects
+git-cvsexportcommit
 git-cvsimport
 git-daemon
 git-diff
@@ -26,6 +28,7 @@ git-diff-files
 git-diff-index
 git-diff-stages
 git-diff-tree
+git-describe
 git-fetch
 git-fetch-pack
 git-findtags
@@ -36,10 +39,12 @@ git-get-tar-commit-id
 git-grep
 git-hash-object
 git-http-fetch
+git-http-push
 git-index-pack
 git-init-db
 git-local-fetch
 git-log
+git-lost-found
 git-ls-files
 git-ls-remote
 git-ls-tree
@@ -50,11 +55,14 @@ git-merge-base
 git-merge-index
 git-merge-octopus
 git-merge-one-file
+git-merge-ours
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
 git-mktag
-git-octopus
+git-name-rev
+git-mv
+git-pack-redundant
 git-pack-objects
 git-parse-remote
 git-patch-id
@@ -67,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
@@ -78,6 +86,7 @@ git-revert
 git-send-email
 git-send-pack
 git-sh-setup
+git-shell
 git-shortlog
 git-show-branch
 git-show-index
@@ -103,6 +112,8 @@ git-verify-tag
 git-whatchanged
 git-write-tree
 git-core-*/?*
+test-date
+test-delta
 *.tar.gz
 *.dsc
 *.deb
@@ -110,3 +121,4 @@ git-core.spec
 *.exe
 libgit.a
 *.o
+*.py[co]