summaryrefslogtreecommitdiffstats
path: root/git-hooks/post-merge
AgeCommit message (Collapse)AuthorFilesLines
2015-05-22Handle fresh clones gracefully in post-merge hookJoakim Reinert1-3/+6
2015-05-05post-merge: Make sure the expected minified js file existsFlorian Pritz1-0/+4
c897aa84567ba046644a87e23b32f3df4c5845d3 changes the name of the file so we need to make sure it will be created even if no js files changed. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-05Fix shebangsFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-05Show changes to NEWS after pullJoakim Reinert1-0/+3
2015-05-05Add update script to git-hooks to be run after git pullJoakim Reinert1-0/+20