Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 561401b2b5cab632afad901c3b886545a3ddd405..14e2b6bde9bef55d678da8ba44dc180b039cd3ac 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -112,6 +112,7 @@
 /git-remote-https
 /git-remote-ftp
 /git-remote-ftps
+/git-remote-testgit
 /git-repack
 /git-replace
 /git-repo-config
@@ -155,6 +156,7 @@
 /git-write-tree
 /git-core-*/?*
 /gitk-git/gitk-wish
+/gitweb/GITWEB-BUILD-OPTIONS
 /gitweb/gitweb.cgi
 /gitweb/gitweb.min.*
 /test-chmtime