From: Sverre Rabbelier Date: Wed, 28 Jan 2009 14:35:48 GMT Subject: Re: [PATCH] Add --ff-only flag to git-merge Message-ID: In-Reply-To: <1233147238-30082-1-git-send-email-nothingmuch@woobling.org> On Wed, Jan 28, 2009 at 13:53, Yuval Kogman wrote: > This patch adds an --ff-only flag to git-merge. When specified git-merge > will exit with an error whenver a merge will not be a simple fast > forward, similar to the default behavior of git push. I like! This calls for a new alias 'git config alias.integrate "merge --no-ff"', thanks! *hopes this hits next soon* -- Cheers, Sverre Rabbelier