add zip to git ignore, and fix gh-pages make

20100204 · Apr 15, 2012 · e985681 · e985681
1 parent 2a6894d
commit e985681
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 *.rej
 *.swo
 *.swp
+*.zip
 *.vi
 *~
 *.sass-cache

diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ bootstrap:
 #
 
 gh-pages: bootstrap docs
-	rm docs/assets/bootstrap.zip
+	rm -f docs/assets/bootstrap.zip
 	zip -r docs/assets/bootstrap.zip bootstrap
 	rm -r bootstrap
 	rm -f ../bootstrap-gh-pages/assets/bootstrap.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     *.rej
     *.swo
     *.swp
+    *.zip
     *.vi
     *~
     *.sass-cache
@@ Expand Down @@