Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix documentation about create and delete branches

Change-Id: Ie5e982d4658336d09fcc8c3572785dc184a7a8e4
This commit is contained in:
David Pursehouse 2018-03-20 10:02:17 +09:00
commit d2612783fc
2 changed files with 9 additions and 10 deletions

View File

@ -424,10 +424,13 @@ messages conform to line length limits.
As project owner you can administrate the branches of your project in
the Gerrit Web UI under `Projects` > `List` > <your project> >
`Branches`. In the Web UI both link:project-configuration.html#branch-creation[
branch creation] and link:project-configuration.html#branch-deletion[branch
deletion] are allowed for project owners without requiring any
additional access rights.
`Branches`. In the Web UI link:project-configuration.html#branch-creation[
branch creation] is allowed if you have
link:access-control.html#category_create[Create Reference] access right and
link:project-configuration.html#branch-deletion[branch deletion] is allowed if
you have the link:access-control.html#category_delete[Delete Reference] or the
link:access-control.html#category_push[Push] access right with the `force`
option.
By setting `HEAD` on the project you can define its
link:project-configuration.html#default-branch[default branch]. For convenience

View File

@ -251,9 +251,7 @@ There are several ways to create a new branch in a project:
To be able to create new branches the user must have the
link:access-control.html#category_create[Create Reference] access
right. In addition, project owners and Gerrit administrators can create
new branches from the Web UI or via REST even without having the
`Create Reference` access right.
right.
When using the Web UI, the REST endpoint or the SSH command it is only
possible to create branches on commits that already exist in the
@ -289,9 +287,7 @@ another method, by force pushing nothing to an existing branch:
To be able to delete branches, the user must have the
link:access-control.html#category_delete[Delete Reference] or the
link:access-control.html#category_push[Push] access right with the
`force` option. In addition, project owners and Gerrit administrators
can delete branches from the Web UI or via REST even without having the
`Force Push` access right.
`force` option.
[[default-branch]]
=== Default Branch