update publish script

3ea58871 · techird · d7f31152 · 3ea58871
Commit 3ea58871 authored Jul 23, 2014 by techird
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

publish publish +4 -6

No files found.
--- a/publish
+++ b/publish
 echo -e "\033[0;33;1mPublish start."
 echo -e "\033[0;33;1m> Checking out gh-pages\033[0m"
-git checkout -q gh-pages
+branch -D gh-pages
+git checkout -q -b gh-pages

-echo -e "\033[0;33;1m> Merging server changes\033[0m"
-git pull origin gh-pages
-
-echo -e "\033[0;33;1m> Merging dev commits\033[0m"
-git merge dev -qm "merge from dev"
+echo -e "\033[0;33;1m> Delete server branch\033[0m"
+git push origin :gh-pages

 echo -e "\033[0;33;1m> Building dist js files\033[0m"
 grunt -q > GRUNT_OUTPUT