pkg-merge-updates: Keep the release commit on its own and other tweaks

Rather than amending the merge commit to add the changelog entry, keep it in a separate commit to make it easier to insert manual changes using git rebase.

Also fix --dry-run and simplify some code.