From 29e746c1e25b2aafb25e689dad7bf70249ab0519 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Tue, 17 May 2016 15:20:02 -0700 Subject: [PATCH 1/2] Add files for gzip_static to .gitignore. #909 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a9fbda604..f13265ea4 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ node_modules/ /.events /.events2 /dist/ +/builds/*.gz From b6b083e33c5ae76551db09424bb84e96c4df26f7 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Tue, 17 May 2016 15:25:13 -0700 Subject: [PATCH 2/2] Have make web update the git config files also. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 83319156c..952ffefc1 100644 --- a/Makefile +++ b/Makefile @@ -340,7 +340,7 @@ stable : distready web : index.html distready -git commit -am "Build web page." cd dist && git merge --no-commit -s ours master - cd dist && git checkout master README.md index.html web.css img + cd dist && git checkout master README.md index.html web.css img .gitignore .gitattributes cd dist && git commit -am "Update web page." update :