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 On Wed, Nov 20, 2013 at 9:53 PM, Wander Lairson Costa <[email protected]> wrote: > 2013/11/20 Brecht Van Lommel <[email protected]>: >> At the moment what we are advising is to rebase for local only >> branches, and merge for branches that are in the repository on >> git.blender.org, and so shared with others. When that branch is going >> to be merged into the master branch, it must be first locally rebased >> and then pushed. >> >> In fact this policy is enforced by the git server now, if you try to >> do a force push anywhere it will reject it, and if you try to do a >> merge commit to the master branch it will reject that too. >> >> > > I didn't know you could configure this policy on git server. Is this a > phabricator feature? > > > -- > Best Regards, > Wander Lairson Costa > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
