diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-17 20:03:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 20:03:33 (GMT) |
| commit | 173473c287f88f6ae40c0bad798087d5bb6f8efe (patch) | |
| tree | 4f1bb8c70714d80652e20b09ebed56708a5c3c26 /Documentation | |
| parent | 1945e8ac85c9f2b01d6e431b267fdb259bd50e1f (diff) | |
| parent | e374747f51736a08d048d3e227053d02b0d28735 (diff) | |
| download | git-173473c287f88f6ae40c0bad798087d5bb6f8efe.zip git-173473c287f88f6ae40c0bad798087d5bb6f8efe.tar.gz git-173473c287f88f6ae40c0bad798087d5bb6f8efe.tar.bz2 | |
Merge branch 'kn/gitweb-extra-branch-refs'
Allow gitweb to be configured to show refs out of refs/heads/ as if
they were branches.
* kn/gitweb-extra-branch-refs:
gitweb: Denote non-heads, non-remotes branches
gitweb: Add a feature for adding more branch refs
gitweb: Return 1 on validation success instead of passed input
gitweb: Move check-ref-format code into separate function
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitweb.conf.txt | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt index e2113d9..db4154f 100644 --- a/Documentation/gitweb.conf.txt +++ b/Documentation/gitweb.conf.txt @@ -849,6 +849,43 @@ time zones in the form of "+/-HHMM", such as "+0200". + Project specific override is not supported. +extra-branch-refs:: + List of additional directories under "refs" which are going to + be used as branch refs. For example if you have a gerrit setup + where all branches under refs/heads/ are official, + push-after-review ones and branches under refs/sandbox/, + refs/wip and refs/other are user ones where permissions are + much wider, then you might want to set this variable as + follows: ++ +-------------------------------------------------------------------------------- +$feature{'extra-branch-refs'}{'default'} = + ['sandbox', 'wip', 'other']; +-------------------------------------------------------------------------------- ++ +This feature can be configured on per-repository basis after setting +$feature{'extra-branch-refs'}{'override'} to true, via repository's +`gitweb.extraBranchRefs` configuration variable, which contains a +space separated list of refs. An example: ++ +-------------------------------------------------------------------------------- +[gitweb] + extraBranchRefs = sandbox wip other +-------------------------------------------------------------------------------- ++ +The gitweb.extraBranchRefs is actually a multi-valued configuration +variable, so following example is also correct and the result is the +same as of the snippet above: ++ +-------------------------------------------------------------------------------- +[gitweb] + extraBranchRefs = sandbox + extraBranchRefs = wip other +-------------------------------------------------------------------------------- ++ +It is an error to specify a ref that does not pass "git check-ref-format" +scrutiny. Duplicated values are filtered. + EXAMPLES -------- |