Merge branch 'maint-1.7.1' into maint

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index dbf1b90c63573b08efc894ed8c1e02de58fd53e4..fcdd822d8a3c97621fb712a1e14b7f62cbdd6d3b 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
@@ -157,7 +158,7 @@
 /gitk-git/gitk-wish
 /gitweb/GITWEB-BUILD-OPTIONS
 /gitweb/gitweb.cgi
-/gitweb/gitweb.min.*
+/gitweb/static/gitweb.min.*
 /test-chmtime
 /test-ctype
 /test-date