summaryrefslogtreecommitdiffstats
path: root/git-hooks/post-merge
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2016-07-31 17:40:25 +0200
committerFlorian Pritz <bluewind@xinu.at>2016-07-31 17:40:25 +0200
commit2ac3f246d713bc3db4c1c8e4b0c77bb70720fbda (patch)
tree6e76cec0d7d504ae60e6fbacffadde1d623ab503 /git-hooks/post-merge
parentf6ce00448691ef570690aa940efbc8a7db6b64f3 (diff)
post-merge: Automatically update composer dependencies
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'git-hooks/post-merge')
-rwxr-xr-xgit-hooks/post-merge2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-hooks/post-merge b/git-hooks/post-merge
index 1fc8b582c..ffcaa5bcc 100755
--- a/git-hooks/post-merge
+++ b/git-hooks/post-merge
@@ -18,6 +18,8 @@ if echo "$changes" | grep scripts/install-git-hooks.sh; then
scripts/install-git-hooks.sh
fi
+composer install --no-dev
+
# Make sure submodules are up to date
git submodule update --init --recursive