From: Marlene Cote <marlene_cote@affirmednetworks.com>
Date: Fri, 24 Feb 2012 19:33:58 GMT
Subject: RE: FW: question about merge in 1.7.10
Message-ID: <1F026B57884A5841B330471696849DE9114508EC@MBX021-W4-CA-5.exch021.domain.local>
In-Reply-To: <4F47E51B.6080401@in.waw.pl>

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.  Since I am not committing, I need to supply a message, but only later when I commit.  Not when I execute the merge command.  This means my scripts don't have to change.

-----Original Message-----
From: Zbigniew Jędrzejewski-Szmek [mailto:zbyszek@in.waw.pl] 
Sent: Friday, February 24, 2012 2:30 PM
To: Marlene Cote
Cc: git@vger.kernel.org
Subject: Re: FW: question about merge in 1.7.10

On 02/24/2012 03:33 PM, Marlene Cote wrote:
>
> I used merge with -no-commit -no-ff.  So, I assume I won't see any change in behavior, since merge is not performing commits, right?
Hi Marlene,
--no-commit only stops the last step, i.e. making of the commit. The tree (working files) is changed before that. So basically after a merge with --no-commit, your tree will be dirty and git status will show modified files.

zbyszek