From 91498af8d7e3f347ef5bcc3a9b1dc7d91d52fd61 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 19 Dec 2013 14:37:46 -0800 Subject: Remove generated new from repo and add to post-merge script --- git/hooks/post-merge | 1 + 1 file changed, 1 insertion(+) (limited to 'git') 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 -- cgit v1.2.3-60-g2f50