From ae4a387156457e7ec0110f741131b33060de5bc5 Mon Sep 17 00:00:00 2001 From: Ian Ward Date: Fri, 17 Oct 2014 13:33:42 -0400 Subject: build docs: make sure our gh-pages branch is up to date --- bin/build-pages.sh | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.1