The git history shouldn't reflect the dev process, it should be maximally useful to other devs. Bugs and mistakes should be squashed/fixup'd before merging. On

The git history shouldn't reflect the dev process, it should be maximally useful to other devs. Bugs and mistakes should be squashed/fixup'd before merging. One squashed commit per feature is also terrible. A commit should contain a set of changes that accomplishes one thing, whatever that means to you and your team.