Linear history at what cost? If we should clean up our local histories before merges/patches, how best to do it?