Merge branch 'jc/cache-tree' into next

diff --git a/.gitignore b/.gitignore
index 7906909b306f80ed74d6e53bb8514a889057194c..cdb2d53318148dbfde43cbcf218abcbb5cf5a434 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -124,6 +124,7 @@ git-core-*/?*
 test-date
 test-delta
 test-dump-cache-tree
+test-gsimm
 common-cmds.h
 *.tar.gz
 *.dsc