summaryrefslogtreecommitdiff
path: root/post-commit
diff options
context:
space:
mode:
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