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 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 :