merge from dev

a6733d5a · techird · 31c1dcc5 · 52b2e4e0 · a6733d5a
Commit a6733d5a authored Apr 09, 2014 by techird
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

publish publish +3 -0

No files found.
--- a/publish
+++ b/publish
@@ -2,6 +2,9 @@ echo -e "\033[0;33;1mPublish start."
 echo -e "\033[0;33;1m> Checking out gh-pages\033[0m"
 git checkout -q 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"