From 0e2aa84b31e4473432af743daef62a4685f420e9 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Thu, 29 Jul 2021 19:27:55 +0300
Subject: [PATCH] Force recreation of files in Git post-merge.

---
 .githooks/post-merge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.githooks/post-merge b/.githooks/post-merge
index c606042..d0978d1 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -5,7 +5,7 @@ notify () { printf '\n\e[1;94m=== %s ====\e[0m\n\n' "$1" >&2; }
 
 cd "$(git rev-parse --show-toplevel)"
 notify 'Generating some configuration and private files.'
-make
+make --directory "$HOME" --always-make
 notify 'Installing Git hooks'
 Documents/bin/install-git-hooks
 notify 'Loading dconf config'
-- 
GitLab