summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorMathieu Brunot <mathieu.brunot@monogramm.io>2020-01-14 15:43:43 +0100
committerGitHub <noreply@github.com>2020-01-14 15:43:43 +0100
commit24472ce71832a2b516e0c96fe73587208eb33c65 (patch)
tree830e82e0781c96068110052dafb8047fb8622565 /utils
parent359c18f9e633fe4cf1062bb2e7507840065e6ca5 (diff)
parentbda189565589b0065152f5a9fba4565404f9bd9a (diff)
Merge branch 'master' into docker/opencontainers
Diffstat (limited to 'utils')
-rw-r--r--utils/makefile.sphinx1
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/makefile.sphinx b/utils/makefile.sphinx
index 5cbc5ebdd..2c1922fc9 100644
--- a/utils/makefile.sphinx
+++ b/utils/makefile.sphinx
@@ -198,6 +198,7 @@ $(GH_PAGES)::
$(MAKE) docs
[ -d "gh-pages/.git" ] || git clone $(GIT_URL) gh-pages
-cd $(GH_PAGES); git checkout gh-pages >/dev/null
+ -cd $(GH_PAGES); git pull
-cd $(GH_PAGES); ls -A | grep -v '.git$$' | xargs rm -rf
cp -r $(DOCS_DIST)/* $(GH_PAGES)/
touch $(GH_PAGES)/.nojekyll