Commit 52b2e4e0 authored by Ronny's avatar Ronny

修改publish

parent 547223aa
...@@ -2,6 +2,9 @@ echo -e "\033[0;33;1mPublish start." ...@@ -2,6 +2,9 @@ echo -e "\033[0;33;1mPublish start."
echo -e "\033[0;33;1m> Checking out gh-pages\033[0m" echo -e "\033[0;33;1m> Checking out gh-pages\033[0m"
git checkout -q gh-pages 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" echo -e "\033[0;33;1m> Merging dev commits\033[0m"
git merge dev -qm "merge from dev" git merge dev -qm "merge from dev"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment