* Use 'set -e' to bail on any errors.
* If the pull request number is not specified, bail out.
* Print a simple pre-merge checklist before prompting for merge.
The KERNEL_CHANGED and PILLS_CHANGED variables used the revision with
'origin' stripped from it (intended for using in messages only), which
caused them to miss remote revisions.
Also tweaks the conditional so that the kernel diff only displays when
pills haven't been updated.
It's very easy to forget to verify that pills have been updated
accordingly when the kernel changes. This adds a warning that prints
when the kernel in the target has changed but the pills have not.
Also prompts the user for confirmation pre-merge.
Replaces the 'merge-and-update-solid' script with the simpler
'merge-with-custom-msg' which merges branches using a custom merge
commit message.
Maintainers may want to alias it locally via something like:
git config alias.mu '!sh/merge-with-custom-msg'
Then use it via:
git mu SOME_BRANCH SOME_PR_NUMBER
