Merge branch 'rs/commit-list-sort-in-batch'

diff --git a/.gitignore b/.gitignore
index 1787c8185d5a750afc4020278cd569eedd173875..83a5c9df1b2c21e21be9375ac01be94c8dcf941a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -92,6 +92,7 @@
 /git-name-rev
 /git-mv
 /git-notes
+/git-p4
 /git-pack-redundant
 /git-pack-objects
 /git-pack-refs
@@ -182,16 +183,13 @@
 /test-match-trees
 /test-mergesort
 /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