On Wed, May 4, 2011 at 12:25 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> Jonathan Nieder <jrnieder@xxxxxxxxx> writes: >> >>> I'm starting to suspect it might be simpler to add a new "[merge] no-ff" >>> configuration item, like the existing "[merge] log". >> >> Surely >> >> Â Â Â [merge] >> Â Â Â Â Â Â Â log = false >> Â Â Â Â Â Â Â ff = false >> >> would be a lot simpler and probably far easier to explain. > > Yes, it is far simpler and easier to explain. ÂI'll leave the tests and > the commit log message to people who are more interested in this topic > than I am ;-) I like the idea. I assume it can be overridden on the command line too? -John -- 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