summaryrefslogtreecommitdiffstats
path: root/git-hooks
diff options
context:
space:
mode:
Diffstat (limited to 'git-hooks')
-rwxr-xr-xgit-hooks/post-merge3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-hooks/post-merge b/git-hooks/post-merge
index 02583897f..358290088 100755
--- a/git-hooks/post-merge
+++ b/git-hooks/post-merge
@@ -14,6 +14,9 @@ if [ ! $fresh_clone ] && [[ -z "$changes" ]]; then
exit
fi
+# Make sure submodules are up to date
+git submodule update --init --recursive
+
# Update databse
php index.php tools update_database