Skip to contentSkip to conversation

Fast-forward-only merge

DISCUSSION Florian Weimer 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

Is there an easy way to require that "git merge" succeeds only if the merge is fast-forward?

Signature · 4 lines
Florian Weimer                <[email protected]>
BFK edv-consulting GmbH       http://www.bfk.de/
Kriegsstraße 100              tel: +49-721-96201-1
D-76133 Karlsruhe             fax: +49-721-96201-99
#1 lore raw

Florian Weimer venit, vidit, dixit 24.07.2009 11:50:

Quoted 3 lines

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