I'm generally persuaded that "hiding the sausage making", ie rewriting history, is the best way to use git. Readable history counts. 1/2