From 60573896b4d4cc6820172cc9ad2d4355f7168662 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 30 Sep 2016 18:24:14 -0400 Subject: sitegen stuff --- post-commit | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'post-commit') 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 -- cgit v1.2.3