aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Rada <marada@uwaterloo.ca>2010-04-02 20:33:55 -0400
committerJunio C Hamano <gitster@pobox.com>2010-04-02 21:23:26 -0700
commit8830bf4bc5b2d03027eff8a4dc6a0cb823ec3c3b (patch)
tree4291b72a194b1e5285234c6f8473e064d878a736
parent890a13a45285ad44858add2ce2f74eb478f549c8 (diff)
downloadgit-8830bf4bc5b2d03027eff8a4dc6a0cb823ec3c3b.tar.gz
git-8830bf4bc5b2d03027eff8a4dc6a0cb823ec3c3b.tar.xz
Gitweb: add ignore and clean rules for minified files
Signed-off-by: Mark Rada <marada@uwaterloo.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.gitignore1
-rw-r--r--Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 7b3acb766..4c2415276 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,6 +156,7 @@
/git-core-*/?*
/gitk-git/gitk-wish
/gitweb/gitweb.cgi
+/gitweb/gitweb.min.*
/test-chmtime
/test-ctype
/test-date
diff --git a/Makefile b/Makefile
index 8a0f5c4d5..62a029ccc 100644
--- a/Makefile
+++ b/Makefile
@@ -2085,7 +2085,7 @@ clean:
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
$(MAKE) -C Documentation/ clean
ifndef NO_PERL
- $(RM) gitweb/gitweb.cgi
+ $(RM) gitweb/gitweb.cgi gitweb/gitweb.min.*
$(MAKE) -C perl clean
endif
ifndef NO_PYTHON