From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 07 Oct 2011 19:01:34 GMT
Subject: Re: [PATCH] Teach merge the '[-e|--edit]' option
Message-ID: <7vobxsvd69.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAG+J_Dz7-tTdgT=cqoKhK+fAhmESLnp93yHyxOF_NOY5Wx01+w@mail.gmail.com>

Jay Soffian <jaysoffian@gmail.com> writes:

> I actually think a better choice would be to remove commit_tree() from
> merge and always have it run commit externally. I'm not seriously
> suggesting that be done, but it would make git more consistent. But
> I'm not going to send in a patch which makes the situation worse.

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".