Re: FW: question about merge in 1.7.10

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 24, 2012, 20:00 UTC
Message-ID: <7vobsoypb3.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1F026B57884A5841B330471696849DE9114503D7@MBX021-W4-CA-5.exch021.domain.local>

Marlene Cote <Marlene_Cote@affirmednetworks.com> writes:

> 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?

The _only_ difference is when

 (1) "git merge" is run interactively;
 (2) the merge goes cleanly that it does not need to ask help from the
     user to resolve conflicts; and
 (3) it records the result by creating a commit.

Because your use case with "--no-commit" does not satisfy the last criteria, I do not expect you to see any difference. Otherwise you may have found a bug.

As noted in

    http://git-blame.blogspot.com/2012/02/anticipating-git-1710.html

please try out the version from the 'master' branch before it gets released, so that you can help us avoid surprises in the corner cases.

Thanks.