From: Sean Gies <sean.gies@imgtec.com>
Date: Wed, 22 Feb 2012 21:51:05 GMT
Subject: Bug report: "git-merge --ff" should fail if branches have diverged
Message-ID: <DB0837FD-0963-4BF9-BD7B-B243F580CC1C@imgtec.com>

Git developers, I have a small bug report:

When I specify the "--ff" option to git-merge, I expect it to perform a fast-forward merge or none at all. If the branches have diverged and a fast-forward cannot be done, I expect the command to fail. With git 1.7.6, if "git-merge -ff" cannot fast-forward, it falls back to creating the merge commit I did not want.

Thank you,
-Sean