Merge branch 'jc/grep' into next

diff --git a/.gitignore b/.gitignore
index a536f32497b75f95b7943c9c639bdf4df0777145..7906909b306f80ed74d6e53bb8514a889057194c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -111,7 +111,6 @@ git-tag
 git-tar-tree
 git-unpack-file
 git-unpack-objects
-git-unresolve
 git-update-index
 git-update-ref
 git-update-server-info
@@ -124,7 +123,7 @@ git-write-tree
 git-core-*/?*
 test-date
 test-delta
-test-gsimm
+test-dump-cache-tree
 common-cmds.h
 *.tar.gz
 *.dsc