From: Jay Soffian <jaysoffian@gmail.com>
Date: Fri, 07 Oct 2011 19:22:22 GMT
Subject: Re: [PATCH] Teach merge the '[-e|--edit]' option
Message-ID: <CAG+J_Dzr188_sLCv+3BXP5M9d2by1VNiOGMcpewi4S4GMnOy2Q@mail.gmail.com>
In-Reply-To: <7vobxsvd69.fsf@alter.siamese.dyndns.org>

On Fri, Oct 7, 2011 at 3:01 PM, Junio C Hamano <gitster@pobox.com> 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.