update_docs.sh in stub_requests-0.1.9 vs update_docs.sh in stub_requests-0.1.10
- old
+ new
@@ -7,11 +7,11 @@
if [[ "$(git diff --stat)" != "" ]]; then
stash_created=1
git stash push -u -a -m "Before updating docs"
fi;
-git reset --hard origin/master
+git pull --rebase
rake yard
git checkout gh-pages
@@ -22,10 +22,10 @@
mv doc/* ./
echo "Sending new documentation to github"
git add --all
git commit -a -m 'Update documentation'
-git push
+git push --force
if [[ $stash_created == 1 ]]; then
git stash pop
fi;