Nathan posted an interesting blog post detailing his style of accepting pull requests and I was curious about what tools/technique other ppl use. Personaly, my workflow looks like this
$ git fetch origin
$ git checkout -b branch_name origin/branch_name
Now, this is where Nathan does something that I thought only I did. I squash all changes in the pull request into one commit and rebase that commit onto master
$ git rebase master -i
$ git co master
$ git merge origin/branch_name
I do this because contributors have a tendency to use their own 'style' of git workflow and it typically doesn't align with the git workflow for the project. So, by using git's rebase and squash I can maintain the git 'flow' of the project I am working on and still keep the contributors notes in tact by putting them in the git commit message. The only drawback is that github doesn't seem to understand this workflow (partially because of the nature of rebase) and will not automatically close out the pull request.
So, what cool technique do all of you use when merging in pull requests?