[huntedsnark]

I really wish there was a fourth option: "Squash and Create a Merge Commit." It's nice to have a single commit per feature, but also see when it was merged into master and by who.