Merge branch 'jn/gitweb-caching-prep'

diff --git a/.gitignore b/.gitignore
index 7aebd6b40e84f7939585c48b74a5f500cb15b200..14e2b6bde9bef55d678da8ba44dc180b039cd3ac 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -156,7 +156,9 @@
 /git-write-tree
 /git-core-*/?*
 /gitk-git/gitk-wish
+/gitweb/GITWEB-BUILD-OPTIONS
 /gitweb/gitweb.cgi
+/gitweb/gitweb.min.*
 /test-chmtime
 /test-ctype
 /test-date
@@ -178,7 +180,7 @@
 *.exe
 *.[aos]
 *.py[co]
-*.o.d
+.depend/
 *+
 /config.mak
 /autom4te.cache