X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=1a9090bffc095abef71bf7a4121d69bfa4372174;hb=b91db2707a4a3c48982c5fa052cf7ee3da8616cf;hp=927c89cbacccf39f12979d02f6f9f473ac13e8e4;hpb=e634aec752642dcf86c3fc82025e43381d6768c2;p=git.git

diff --git a/.gitignore b/.gitignore
index 927c89cb..1a9090bf 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
@@ -36,10 +38,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,13 +54,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-name-rev
 git-mv
-git-octopus
+git-pack-redundant
 git-pack-objects
 git-parse-remote
 git-patch-id
@@ -69,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
@@ -106,6 +111,8 @@ git-verify-tag
 git-whatchanged
 git-write-tree
 git-core-*/?*
+test-date
+test-delta
 *.tar.gz
 *.dsc
 *.deb
@@ -113,3 +120,4 @@ git-core.spec
 *.exe
 libgit.a
 *.o
+*.py[co]