Rebased to master in 730ecad.

@rycee btw is there a specific reason you merge PRs manually? That's a bit confusing as GitHub shows them as closed instead of merged.

If you just want to avoid the extra merge commit you can use "Squash and merge" (assuming only one commit) or "Rebase and merge" (though I didn't try that one yet). Alternatively it should work if you first update your branch and then push to NixOS:master.

@primeos Ah, no I've never reflected on it. I just use the quickest and cleanest way I've found to review and merge single commit PRs into master. I use git-hub for it so it's also possible to avoid the github site. I don't know why git-hub is marking the PRs as closed instead of merged, perhaps it due to some limitation of the github API?

I think I tried the squash and merge button once but it was a bit clunky to fix the commit message in a browser text box without having access to the magit commit message edit mode. Maybe the rebase and merge won't have that problem, but I do often make some final edits of the commit message when I merge. Of course, both methods will cause the final commit to be unsigned, which I think is a pity.