diff options
Diffstat (limited to 'bin/build-pages.sh')
| -rwxr-xr-x | bin/build-pages.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/build-pages.sh b/bin/build-pages.sh index 6e27158..d9a2dfa 100755 --- a/bin/build-pages.sh +++ b/bin/build-pages.sh @@ -7,6 +7,8 @@ rm -r build/sphinx || true python setup.py build_sphinx git checkout gh-pages +git fetch origin gh-pages +git merge --ff-only origin/gh-pages git rm `git ls-files` git checkout HEAD CNAME git checkout HEAD .nojekyll |