summaryrefslogtreecommitdiff
path: root/git/hooks/post-merge
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-12-19 14:37:46 -0800
committerBen Longbons <b.r.longbons@gmail.com>2013-12-19 14:37:46 -0800
commit91498af8d7e3f347ef5bcc3a9b1dc7d91d52fd61 (patch)
tree87573a93200fda4dd4d410a711b9a2b3998694d4 /git/hooks/post-merge
parente34e49d3064640e01305549413c862ee0a7a79aa (diff)
downloadserverdata-91498af8d7e3f347ef5bcc3a9b1dc7d91d52fd61.tar.gz
serverdata-91498af8d7e3f347ef5bcc3a9b1dc7d91d52fd61.tar.bz2
serverdata-91498af8d7e3f347ef5bcc3a9b1dc7d91d52fd61.tar.xz
serverdata-91498af8d7e3f347ef5bcc3a9b1dc7d91d52fd61.zip
Remove generated new from repo and add to post-merge script
Diffstat (limited to 'git/hooks/post-merge')
-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