--first-parent is incredibly useful, but having both merge commits and properly curated atomic commits under them is even more useful.