summaryrefslogtreecommitdiffstats
path: root/git-hooks
diff options
context:
space:
mode:
Diffstat (limited to 'git-hooks')
-rwxr-xr-xgit-hooks/post-merge4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-hooks/post-merge b/git-hooks/post-merge
index 358290088..1fc8b582c 100755
--- a/git-hooks/post-merge
+++ b/git-hooks/post-merge
@@ -14,6 +14,10 @@ if [ ! $fresh_clone ] && [[ -z "$changes" ]]; then
exit
fi
+if echo "$changes" | grep scripts/install-git-hooks.sh; then
+ scripts/install-git-hooks.sh
+fi
+
# Make sure submodules are up to date
git submodule update --init --recursive