diff options
| author | Joakim Reinert <mail@jreinert.com> | 2015-05-04 00:32:50 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-05-05 12:21:27 +0200 |
| commit | e9f7b053141043e683a549783eea634072051a69 (patch) | |
| tree | 101ea403c1490c74053aa35c916e4da4e0b48507 /git-hooks | |
| parent | 9de52c2a252b8de46b10a57c8ff2e69c75cabdd3 (diff) | |
Show changes to NEWS after pull
Diffstat (limited to 'git-hooks')
| -rwxr-xr-x | git-hooks/post-merge | 3 |
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 |