Preserve commit history on merge

Simply squashing deletes any commit history -- we want to preserve anything that may be useful. 

To be perfect, this *does* require the developer to clean up their history before `git finish`, but that's good practice anyway.