X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=b4355b9faf598ff23243954b6b1aaa5cc3a6e832;hb=be1295d16a2593dcf468fef7d9e811d057d9039f;hp=975e773fec56c7cf747f73b4822bffb017e2e79f;hpb=542a01e4895fb3e57baab709194bdb25d7ad5217;p=git.git

diff --git a/.gitignore b/.gitignore
index 975e773f..b4355b9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
+GIT-VERSION-FILE
 git
 git-add
 git-am
+git-annotate
 git-apply
 git-applymbox
 git-applypatch
@@ -12,19 +14,23 @@ git-check-ref-format
 git-checkout
 git-checkout-index
 git-cherry
+git-cherry-pick
 git-clone
 git-clone-pack
 git-commit
 git-commit-tree
 git-convert-objects
 git-count-objects
+git-cvsexportcommit
 git-cvsimport
+git-cvsserver
 git-daemon
 git-diff
 git-diff-files
 git-diff-index
 git-diff-stages
 git-diff-tree
+git-describe
 git-fetch
 git-fetch-pack
 git-findtags
@@ -35,10 +41,13 @@ git-get-tar-commit-id
 git-grep
 git-hash-object
 git-http-fetch
+git-http-push
+git-imap-send
 git-index-pack
 git-init-db
 git-local-fetch
 git-log
+git-lost-found
 git-ls-files
 git-ls-remote
 git-ls-tree
@@ -47,13 +56,18 @@ git-mailsplit
 git-merge
 git-merge-base
 git-merge-index
+git-merge-tree
 git-merge-octopus
 git-merge-one-file
+git-merge-ours
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
 git-mktag
-git-octopus
+git-mktree
+git-name-rev
+git-mv
+git-pack-redundant
 git-pack-objects
 git-parse-remote
 git-patch-id
@@ -66,18 +80,22 @@ 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
 git-rev-parse
 git-revert
+git-rm
 git-send-email
 git-send-pack
 git-sh-setup
+git-shell
 git-shortlog
+git-show
 git-show-branch
 git-show-index
 git-ssh-fetch
@@ -102,6 +120,9 @@ git-verify-tag
 git-whatchanged
 git-write-tree
 git-core-*/?*
+test-date
+test-delta
+common-cmds.h
 *.tar.gz
 *.dsc
 *.deb
@@ -109,3 +130,6 @@ git-core.spec
 *.exe
 libgit.a
 *.o
+*.py[co]
+config.mak
+git-blame