From f069633dd5b9f5fb552542854721f0454a3ff1fb Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Sun, 5 Apr 2020 14:50:36 -0700
Subject: adds git hook post-merge to run init.sh

---
 misc/git-hooks/post-merge.sh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 misc/git-hooks/post-merge.sh

diff --git a/misc/git-hooks/post-merge.sh b/misc/git-hooks/post-merge.sh
new file mode 100644
index 000000000..c32d46c55
--- /dev/null
+++ b/misc/git-hooks/post-merge.sh
@@ -0,0 +1,2 @@
+#!/bin/bash -e
+bash init.sh
-- 
cgit v1.2.3