From 556f2aae0c3b338d3c4cdc30e96ed1c09bbd1c3f Mon Sep 17 00:00:00 2001 From: Thaddee Tyl Date: Wed, 26 Feb 2014 11:17:28 +0100 Subject: [PATCH] Deploy includes uploading the new website. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a994bde..bd46f7a 100644 --- a/Makefile +++ b/Makefile @@ -5,15 +5,15 @@ favicon: website: cat try.html | sed "s, index.html - (git checkout -B gh-pages && \ - git merge master && \ - git push origin gh-pages:gh-pages) || git checkout master - git checkout master deploy: git add Verdana.ttf git commit -m'MUST NOT BE ON GITHUB' git push -f heroku HEAD:master git reset HEAD~1 + (git checkout -B gh-pages && \ + git merge master && \ + git push origin gh-pages:gh-pages) || git checkout master + git checkout master .PHONY: all favicon website deploy