Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maint

diff --git a/.gitignore b/.gitignore
index 5bfb234591a63446d9fccf7665e442f02d1c76b5..a05241916c9c9a3760a6e98670a7f6427d553d77 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -74,6 +74,7 @@
 /git-index-pack
 /git-init
 /git-init-db
+/git-interpret-trailers
 /git-instaweb
 /git-log
 /git-ls-files
@@ -199,6 +200,7 @@
 /test-revision-walking
 /test-run-command
 /test-sha1
+/test-sha1-array
 /test-sigchain
 /test-string-list
 /test-subprocess