On Mon, Jul 22, 2013 at 06:40:18AM -0500, Kris Borchers wrote: > I'll just take this as an opportunity to once again say I hate merge > commits and thus, I hate --no-ff in all cases. you could scream "I told ya" instead :P We need to find a compromise - going all --no-ff has drawbacks, squashing has them too (gigantic commits) -- qmx