Merge branch 'jc/cache-tree' into next

diff --git a/.gitignore b/.gitignore
index 5be239a4aa95f78cb09e4921459e1678b9f3c36e..cdb2d53318148dbfde43cbcf218abcbb5cf5a434 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ git-checkout
 git-checkout-index
 git-cherry
 git-cherry-pick
+git-clean
 git-clone
 git-clone-pack
 git-commit
@@ -42,6 +43,7 @@ git-grep
 git-hash-object
 git-http-fetch
 git-http-push
+git-imap-send
 git-index-pack
 git-init-db
 git-local-fetch
@@ -121,12 +123,15 @@ git-write-tree
 git-core-*/?*
 test-date
 test-delta
+test-dump-cache-tree
+test-gsimm
+common-cmds.h
 *.tar.gz
 *.dsc
 *.deb
 git-core.spec
 *.exe
-libgit.a
-*.o
+*.[ao]
 *.py[co]
 config.mak
+git-blame