[Bf-committers] How Merge master changes into remote branch

[Wander Lairson Costa]

2013/11/20 Brecht Van Lommel <brechtvanlommel at pandora.be>:
> We have set the denyNonFastForwards option to disable force push:
> http://stackoverflow.com/questions/1754491/is-there-a-way-to-configure-git-repository-to-reject-git-push-force
>
> For denying merge commits to the master branch, we use this update
> hook (modified from the update.sample hook):
> http://developer.blender.org/P1
>

Oh, I missed this. Simpler than I thought, thanks!


-- 
Best Regards,
Wander Lairson Costa