Don't log quite so much and preserve multiple parents in commits