2 messages, 2 authors, 2016-06-15 · open the first message on its own page
From: Florian Weimer <hidden>
Date: 2016-06-15 22:47:05
Is there an easy way to require that "git merge" succeeds only if the merge is fast-forward? -- Florian Weimer [off-list ref] BFK edv-consulting GmbH http://www.bfk.de/ Kriegsstraße 100 tel: +49-721-96201-1 D-76133 Karlsruhe fax: +49-721-96201-99
From: Michael J Gruber <hidden>
Date: 2016-06-15 22:47:05
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