W. Trevor King wrote: > On Thu, May 01, 2014 at 06:34:06PM -0500, Felipe Contreras wrote: > > Nobody ever complained about somebody doing a fast-forward by mistake. > > Unless they fast-forward merged a feature branch into master, but the > project prefers explicitly-merged feature branches with a cover-letter > explaination in the merge commit [1]. On the one hand, folks > integrating feature branches are likely more experienced Git users. Exactly. That's barely an issue. > I agree that accidental ff-merges are likely to be less troublesome > than accidental non-ff merge/rebases, but I don't think changing the > default to ff-only is a perfect fix. I don't see what else we could do. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html