Squash and merge ftw. I know some developers are uniquely passionate about zen gardening their feature branch commits, but the reality is that GitHub prevents any reviewer from easily parsing your commit story.