Merge branch 'jc/cache-tree' into next

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1e4ba7b209282f0ef16729dfffe8428a549c5f27..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,6 +123,7 @@ git-write-tree
 git-core-*/?*
 test-date
 test-delta
+test-dump-cache-tree
 common-cmds.h
 *.tar.gz
 *.dsc