Permalink
Browse files

<sigh> why won't people read just *one* para more...?

OK I agree the starting line was *just* misleading enough to give the
opposite impression, but still, when the next para starts with "The
rules are..." wouldn't you expect people would read *that* too?
  • Loading branch information...
1 parent 9dd191e commit dceb40a104731b3e7eec546ac23d84964f81714b @sitaramc committed Feb 22, 2012
Showing with 9 additions and 9 deletions.
  1. +9 −9 doc/gitolite.conf.mkd
View
18 doc/gitolite.conf.mkd
@@ -475,15 +475,15 @@ Some usage hints:
### #mergecheck enforcing a no-merges policy
-Some people want to enforce a no-merges policy for various reasons. This
-behaviour can be enabled by suffixing an "M" to the end of any permission
-starting with `RW` (i.e., all of them except `R`). So for instance, `RW`
-becomes `RWM`, and `RW+` becomes `RW+M`, etc.
-
-The rules are exactly the same as for "C" and "D": once a repo has an "M"
-qualifier tied to any access rule, all rules for that repo are subject to
-merge checking, and merge commits will only be allowed when the rule has the
-"M" qualifier.
+Some people want to enforce a no-merges policy for various reasons. The new
+"M" qualifier can be used to specify who is allowed to push merge commits.
+This works just like "C" and "D" in the previous section, so **please read
+that for a more detailed description** and apply the same ideas, (including
+the `@all` trick!) to "M" for "allow merge commits".
+
+The only other thing to remember is that this qualifier, if used, goes at the
+end of any permission starting with `RW` (i.e., all of them except `R`). For
+example, `RW` becomes `RWM`, `RW+` becomes `RW+M`, `RW+CD` becomes `RW+CDM`.
## summary: permissions

0 comments on commit dceb40a

Please sign in to comment.