From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 24 Feb 2012 19:29:31 GMT
Subject: Re: FW: question about merge in 1.7.10
Message-ID: <4F47E51B.6080401@in.waw.pl>
In-Reply-To: <1F026B57884A5841B330471696849DE9114503D7@MBX021-W4-CA-5.exch021.domain.local>

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