From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Feb 2012 22:14:24 GMT
Subject: Re: Bug report: "git-merge --ff" should fail if branches have diverged
Message-ID: <7vr4xm8qin.fsf@alter.siamese.dyndns.org>
In-Reply-To: <DB0837FD-0963-4BF9-BD7B-B243F580CC1C@imgtec.com>

Sean Gies <Sean.Gies@imgtec.com> writes:

> When I specify the "--ff" option to git-merge, I expect it to perform a
> fast-forward merge or none at all.

That expectation needs to be adjusted with s/--ff/--ff-only/, I think.

The "--no-ff" option says "Never do fast-forward and always create extra
commit even when the side branch is a descendant", and the "--ff" option
is a way to countermand it, i.e. "It is ok to fast-forward this merge".

And there is another one "I do not want anything bug fast forward", and
that is spelled --ff-only.