deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge-check: documentation

Browse source
This commit is contained in:
Sitaram Chamarty 2012-01-16 10:05:41 +05:30
parent 2762f7abfd
commit fdfad75210
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doc/gitolite.conf.mkd
View file

@ -43,6 +43,9 @@ syntax).
RW+ can no longer delete a ref; it can only rewind RW+ can no longer delete a ref; it can only rewind
* (RWCD and RW+CD, which is just a combination of these two) * (RWCD and RW+CD, which is just a combination of these two)
Even later, [gitolite acquired][mergecheck], if you want to enforce a
rebase-only workflow.
The following sections dig deeper into the syntax and semantics of the access The following sections dig deeper into the syntax and semantics of the access
control rules and other configuration directives in the `gitolite.conf` file. control rules and other configuration directives in the `gitolite.conf` file.
If narrative descriptions scare you, or your English is not upto scratch, try If narrative descriptions scare you, or your English is not upto scratch, try
@ -435,6 +438,17 @@ Some usage hints:
where foo can be either the administrator, or if you can ignore the where foo can be either the administrator, or if you can ignore the
warning message when you push, a non-existant user. warning message when you push, a non-existant user.
### #mergecheck enforcing a no-merges policy
Some people want to enforce a no-merges policy for various reasons. This can
be done by suffixing an "M" to the permissions, so for instance, `RW` becomes
`RWM`, and `RW+` becomes `RW+M`.
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.
## summary: permissions ## summary: permissions
The full set of permissions, in regex syntax: `-|R|RW+?C?D?`. This expands to The full set of permissions, in regex syntax: `-|R|RW+?C?D?`. This expands to