diff options
author | Sitaram Chamarty <sitaram@atc.tcs.com> | 2012-01-16 10:05:41 +0530 |
---|---|---|
committer | Sitaram Chamarty <sitaram@atc.tcs.com> | 2012-01-16 10:33:04 +0530 |
commit | fdfad75210cf38129fff44b0f385ea8ffec21534 (patch) | |
tree | edae126966af2767cf3e8a4684434185df3280b9 | |
parent | merge-check: test script (first test using 'tsh', yaaay!) (diff) | |
download | gitolite-gentoo-fdfad75210cf38129fff44b0f385ea8ffec21534.tar.gz gitolite-gentoo-fdfad75210cf38129fff44b0f385ea8ffec21534.tar.bz2 gitolite-gentoo-fdfad75210cf38129fff44b0f385ea8ffec21534.zip |
merge-check: documentation
-rw-r--r-- | doc/gitolite.conf.mkd | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/gitolite.conf.mkd b/doc/gitolite.conf.mkd index 10ef912..d602937 100644 --- a/doc/gitolite.conf.mkd +++ b/doc/gitolite.conf.mkd @@ -43,6 +43,9 @@ syntax). RW+ can no longer delete a ref; it can only rewind * (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 control rules and other configuration directives in the `gitolite.conf` file. 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 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 The full set of permissions, in regex syntax: `-|R|RW+?C?D?`. This expands to |