Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2b7a3f98764cda0e65398694786d4822da2e8f38..87fcc5f6ff2e180280ff767fd291247739c7d0fa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -175,21 +175,19 @@
 /test-date
 /test-delta
 /test-dump-cache-tree
+/test-scrap-cache-tree
 /test-genrandom
 /test-index-version
 /test-line-buffer
 /test-match-trees
 /test-mktemp
-/test-obj-pool
 /test-parse-options
 /test-path-utils
 /test-run-command
 /test-sha1
 /test-sigchain
-/test-string-pool
 /test-subprocess
 /test-svn-fe
-/test-treap
 /common-cmds.h
 *.tar.gz
 *.dsc