Merge branch 'master' of git://repo.or.cz/git/fastimport

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e8d2731ee5d7b3ad58bd0bebfe1ae87bed140615..4dc0c395fa7d6e7cff7588ee66c928c954cc014d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 GIT-CFLAGS
+GIT-GUI-VARS
 GIT-VERSION-FILE
 git
 git-add
@@ -15,6 +16,7 @@ git-blame
 git-branch
 git-bundle
 git-cat-file
+git-check-attr
 git-check-ref-format
 git-checkout
 git-checkout-index
@@ -76,6 +78,7 @@ git-merge-ours
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
+git-merge-subtree
 git-mergetool
 git-mktag
 git-mktree
@@ -141,11 +144,14 @@ git-verify-tag
 git-whatchanged
 git-write-tree
 git-core-*/?*
+gitk-wish
 gitweb/gitweb.cgi
 test-chmtime
 test-date
 test-delta
 test-dump-cache-tree
+test-genrandom
+test-match-trees
 common-cmds.h
 *.tar.gz
 *.dsc