Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 62afef2347bb747aaaf8796e9f9ff5decc647e0e..c8c13f550317e12ccb5d3515fbc942463c8be4e0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -128,7 +128,6 @@ git-status
 git-stripspace
 git-submodule
 git-svn
-git-svnimport
 git-symbolic-ref
 git-tag
 git-tar-tree
@@ -154,6 +153,7 @@ test-delta
 test-dump-cache-tree
 test-genrandom
 test-match-trees
+test-parse-options
 test-sha1
 common-cmds.h
 *.tar.gz