So at work we're implementing a new, nice Git branching strategy - Awesome!
In order to preserve the new (and nice) structure of our repository, we would like all merges to be done with the --no-ff flag (and the --no-commit flag to allow for better merge commit messages). However, it seems that just asking everyone to remember it, is a bit unreliable. Is there any way to enforce that every developer must merge with the aforementioned flags?
As far as I can tell, it's not possible to check this with a hook (as git does not reliably store any information about the fast-forward). I know it's possible to set configuration on each developers machine (by running git config --global merge.ff no). If this is the solution, how do I make sure that every developer has this configuration set?