Skip to content

K
kityminder-core
Commit a6733d5a authored by techird's avatar techird
Browse files
Options

merge from dev

parents 31c1dcc5 52b2e4e0
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
publish
View file @ a6733d5a
...@@ -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