Merge branch 'tc/merge-m-log' into maint

diff --git a/.gitignore b/.gitignore
index 561401b2b5cab632afad901c3b886545a3ddd405..dbf1b90c63573b08efc894ed8c1e02de58fd53e4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -155,6 +155,7 @@
 /git-write-tree
 /git-core-*/?*
 /gitk-git/gitk-wish
+/gitweb/GITWEB-BUILD-OPTIONS
 /gitweb/gitweb.cgi
 /gitweb/gitweb.min.*
 /test-chmtime