From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Fri, 24 Jul 2009 10:40:00 GMT
Subject: Re: Fast-forward-only merge
Message-ID: <4A698F80.2020801@drmicha.warpmail.net>
In-Reply-To: <82ws5y4dfs.fsf@mid.bfk.de>

Florian Weimer venit, vidit, dixit 24.07.2009 11:50:
> Is there an easy way to require that "git merge" succeeds only if the
> merge is fast-forward?
> 

There's an easy way to test before the merge (git merge-base), but an
option for git merge is still missing:

http://article.gmane.org/gmane.comp.version-control.git/76787
http://article.gmane.org/gmane.comp.version-control.git/80284
http://article.gmane.org/gmane.comp.version-control.git/107768
http://article.gmane.org/gmane.comp.version-control.git/118529

Cheers,
Michael