From 5e5bd939be4de60d76b388513687e932016a2d71 Mon Sep 17 00:00:00 2001 From: Aanand Prasad Date: Mon, 27 Jan 2014 21:43:37 +0000 Subject: [PATCH] Stop force-pushing to gh-pages --- script/deploy-docs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/script/deploy-docs b/script/deploy-docs index 4bb6b7b0e..d95f2ba4c 100755 --- a/script/deploy-docs +++ b/script/deploy-docs @@ -15,12 +15,15 @@ if !(git remote | grep origin); then git remote add origin git@github.com:orchardup/fig.git fi +git fetch origin +git reset --soft origin/gh-pages + echo ".git-gh-pages" > .gitignore git add -u git add . git commit -m "update" || echo "didn't commit" -git push -f origin master:gh-pages +git push origin master:gh-pages popd