4 Commits

Author	SHA1	Message	Date
Andy Tudhope	5f979cdf8c	merge-pr script should prompt for multiple commits ... Fixes #2971 Because I don't think it is worth a bounty - all the code required was already in the `merge-external-pr.sh` so I have just copied the relevant parts across and added the few necessary lines to ensure that PRs from core contributors cannot be merged unless they have been squashed down to a single commit. Changed fatal to confirm for merge-pr	2018-01-16 18:01:53 +01:00
Oskar Thoren	0ad29ed164	Fix merge-pr script so it runs as bash ... As opposed to wannabe POSIX with bashisms. Makes it run reliably on most user systems (Mac/Linux)	2017-12-15 11:01:39 +01:00
Julien Eluard	518f68f08f	Added build scripts	2017-12-12 09:05:18 +01:00
Oskar Thoren	a68f065237	Add merge-pr.sh script	2017-12-06 16:34:02 +01:00