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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html