summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
Diffstat (limited to 'git')
-rwxr-xr-xgit/hooks/post-merge1
1 files changed, 1 insertions, 0 deletions
diff --git a/git/hooks/post-merge b/git/hooks/post-merge
index 1105fd9f..8a8b6bfc 100755
--- a/git/hooks/post-merge
+++ b/git/hooks/post-merge
@@ -9,6 +9,7 @@
# (rebase is better but dangerous in some circumstances)
# git submodule update --rebase
git submodule update --merge
+make news
# WARNING: to people with push access.
# it is essential that changes to the client data be pushed before changes to server data