summaryrefslogtreecommitdiffstats
path: root/git-hooks/post-merge
diff options
context:
space:
mode:
Diffstat (limited to 'git-hooks/post-merge')
-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 4f4f5a994..28c1ecb11 100755
--- a/git-hooks/post-merge
+++ b/git-hooks/post-merge
@@ -18,3 +18,6 @@ php index.php tools update_database
if echo "$changes" | grep data/js/ > /dev/null; then
scripts/optimize_js.sh
fi
+
+# Show changes to NEWS
+git diff @{1} NEWS | cat