Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 20560b810b0471c3b7d012bf0f14d7885e2b83ec..3dd6ef7d259d8fe2811f68525b5309e97c79f4cc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -112,6 +112,8 @@
 /git-remote-https
 /git-remote-ftp
 /git-remote-ftps
+/git-remote-fd
+/git-remote-ext
 /git-remote-testgit
 /git-repack
 /git-replace
@@ -175,6 +177,7 @@
 /test-sha1
 /test-sigchain
 /test-string-pool
+/test-subprocess
 /test-svn-fe
 /test-treap
 /common-cmds.h