.gitconfig: Add alias to merge GitHub pull request

Ref. https://help.github.com/articles/checking-out-pull-requests-locally

Closes #422.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  .gitconfig: Add alias to merge GitHub pull request