# Fast-forward-only merge 2 messages from 2009-07-24 to 2009-07-24. Participants: Florian Weimer, Michael J Gruber. Thread: https://gitlist.dev/t/20215 ## Florian Weimer, 2009-07-24 09:50 Subject: Fast-forward-only merge Message-ID: <82ws5y4dfs.fsf@mid.bfk.de> URL: https://gitlist.dev/e/82ws5y4dfs.fsf%40mid.bfk.de ``` Is there an easy way to require that "git merge" succeeds only if the merge is fast-forward? -- Florian Weimer BFK edv-consulting GmbH http://www.bfk.de/ Kriegsstraße 100 tel: +49-721-96201-1 D-76133 Karlsruhe fax: +49-721-96201-99 ``` ## Michael J Gruber, 2009-07-24 10:40 Subject: Re: Fast-forward-only merge Message-ID: <4A698F80.2020801@drmicha.warpmail.net> URL: https://gitlist.dev/e/4A698F80.2020801%40drmicha.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 ```