From: Marlene Cote <marlene_cote@affirmednetworks.com>
Date: Fri, 24 Feb 2012 21:24:50 GMT
Subject: RE: FW: question about merge in 1.7.10
Message-ID: <1F026B57884A5841B330471696849DE911450B9B@MBX021-W4-CA-5.exch021.domain.local>
In-Reply-To: <7vbooox6xy.fsf@alter.siamese.dyndns.org>

Sorry.  You are correct.  You said it would open an editor session.  

-----Original Message-----
From: Junio C Hamano [mailto:gitster@pobox.com] 
Sent: Friday, February 24, 2012 4:23 PM
To: Marlene Cote
Cc: Zbigniew Jędrzejewski-Szmek; git@vger.kernel.org
Subject: Re: FW: question about merge in 1.7.10

Marlene Cote <Marlene_Cote@affirmednetworks.com> writes:

> I know that the tree will be dirty.  The change to git in 1.7.10 says 
> that the merge will require a commit message when the command is run.

I do not think I ever said that.

	"merge" will always start an editor when it auto-commits

is what I said.

Could you point me where you read that "will require a commit message", so that it can be corrected?