David Wragg
2db4b7e2ec
It's easier to find the gh-pages scripts than it is to find the instructions on their use.
21 lines
489 B
Bash
Executable File
21 lines
489 B
Bash
Executable File
#! /bin/bash
|
|
set -e
|
|
|
|
# For info on why/how to use this script, see
|
|
# https://github.com/zettio/weave/wiki/WorkingOnWeave#working-on-docs
|
|
|
|
MERGE_ARGS="-X subtree=site"
|
|
|
|
merge_dir=$(mktemp -d -t weave-merge.XXXXXX)/weave
|
|
git clone -b gh-pages . $merge_dir
|
|
|
|
pushd $merge_dir
|
|
git pull --ff-only git@github.com:zettio/weave gh-pages
|
|
git fetch origin master
|
|
git merge $MERGE_ARGS -e -m "Merge master into gh-pages" origin/master
|
|
|
|
popd
|
|
git fetch $merge_dir gh-pages:gh-pages
|
|
|
|
# rm -rf $merge_dir
|