On Fri, Oct 7, 2011 at 3:01 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Think about it. What I suggested does no way make the situation > worse. Your patch _does_ make it worse by changing the hook behaviour > between "merge -m 'foo'" vs "merge -m 'foo' -e" I think it's arguable how -e should behave. With -e opening my editor, now I really feel like I'm making a commit and would be surprised by not having the various commit hooks run. j. -- 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