1
1
mirror of https://github.com/varkor/quiver.git synced 2024-10-26 07:09:37 +03:00

Ensure the gh-pages Makefile target pushes from master

This commit is contained in:
varkor 2020-03-04 13:01:09 +00:00
parent ed47b13b67
commit bb193adad0

View File

@ -12,7 +12,11 @@ all:
# Update the quiver GitHub Pages application.
gh-pages:
# Make sure we split out a subtree from master, rather than the branch we are currently on.
git checkout master
# Split out the `src` subdirectory and push it to the `pre-gh-pages` branch on remote `origin`.
git subtree push --prefix src origin pre-gh-pages
# Rebase the changes over the fixed commits on `gh-pages` (i.e. manually adding KaTeX).
git worktree add ../quiver-worktree pre-gh-pages
cd ../quiver-worktree
git pull
@ -21,3 +25,5 @@ gh-pages:
git push --force
cd ../quiver
git worktree remove ../quiver-worktree
# Checkout the branch we were originally working on.
git checkout @{-1}