summaryrefslogtreecommitdiff
path: root/post-commit
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-09-30 18:24:14 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-09-30 18:24:14 -0400
commit60573896b4d4cc6820172cc9ad2d4355f7168662 (patch)
tree2c26fdefa9e1edcba31d755b0632fd417d97a71a /post-commit
parent6f7d74f8a0c5a77441b34e3b42950c18127da3d7 (diff)
sitegen stuff
Diffstat (limited to 'post-commit')
-rwxr-xr-xpost-commit5
1 files changed, 5 insertions, 0 deletions
diff --git a/post-commit b/post-commit
index 09d2f7f..6abf27a 100755
--- a/post-commit
+++ b/post-commit
@@ -2,10 +2,15 @@
branch=$(git name-rev --name-only HEAD)
if [[ $branch == master ]]; then
+ git add .
+ git stash
+
git checkout pre-generated
git merge master -m 'bogus'
make --always-make -j12
git add .
git commit --amend -m "make: $(git log -n1 master --pretty=format:%B)"
+
git checkout master
+ git stash pop
fi