Marlene Cote <Marlene_Cote@xxxxxxxxxxxxxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html