opendev/gerrit
Code Issues Proposed changes

Documentation: add REBASE_ALWAYS as submit type option where omitted

Browse Source 
Change-Id: Ide1ee611bc14c3b2170cec024d2519c3297c66aa
This commit is contained in:
Gert van Dijk 2017-08-27 22:50:40 +02:00 committed by David Pursehouse
parent bc683f2f2d
commit a4e49d0a01
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/cmd-create-project.txt
View File

@ -102,6 +102,7 @@ Description values containing spaces should be quoted in single quotes
* FAST_FORWARD_ONLY: produces a strictly linear history. * FAST_FORWARD_ONLY: produces a strictly linear history.
* MERGE_IF_NECESSARY: create a merge commit when required. * MERGE_IF_NECESSARY: create a merge commit when required.
* REBASE_IF_NECESSARY: rebase the commit when required. * REBASE_IF_NECESSARY: rebase the commit when required.
* REBASE_ALWAYS: always rebase the commit including dependencies.
* MERGE_ALWAYS: always create a merge commit. * MERGE_ALWAYS: always create a merge commit.
* CHERRY_PICK: always cherry-pick the commit. * CHERRY_PICK: always cherry-pick the commit.

1
Documentation/cmd-set-project.txt
View File

@ -53,6 +53,7 @@ Description values containing spaces should be quoted in single quotes
* FAST_FORWARD_ONLY: produces a strictly linear history. * FAST_FORWARD_ONLY: produces a strictly linear history.
* MERGE_IF_NECESSARY: create a merge commit when required. * MERGE_IF_NECESSARY: create a merge commit when required.
* REBASE_IF_NECESSARY: rebase the commit when required. * REBASE_IF_NECESSARY: rebase the commit when required.
* REBASE_ALWAYS: always rebase the commit including dependencies.
* MERGE_ALWAYS: always create a merge commit. * MERGE_ALWAYS: always create a merge commit.
* CHERRY_PICK: always cherry-pick the commit. * CHERRY_PICK: always cherry-pick the commit.

4
Documentation/config-gerrit.txt
View File

@ -3587,7 +3587,9 @@ Path must be absolute.
+ +
The default submit type for newly created projects. Supported values The default submit type for newly created projects. Supported values
are `MERGE_IF_NECESSARY`, `FAST_FORWARD_ONLY`, `REBASE_IF_NECESSARY`, are `MERGE_IF_NECESSARY`, `FAST_FORWARD_ONLY`, `REBASE_IF_NECESSARY`,
`MERGE_ALWAYS` and `CHERRY_PICK`. `REBASE_ALWAYS`, `MERGE_ALWAYS` and `CHERRY_PICK`.
+
For more details see link:project-configuration.html#submit_type[Submit Types].
+ +
By default, `MERGE_IF_NECESSARY`. By default, `MERGE_IF_NECESSARY`.

2
Documentation/rest-api-changes.txt
View File

@ -5817,7 +5817,7 @@ change.
|Field Name ||Description |Field Name ||Description
|`submit_type` || |`submit_type` ||
Submit type used for this change, can be `MERGE_IF_NECESSARY`, Submit type used for this change, can be `MERGE_IF_NECESSARY`,
`FAST_FORWARD_ONLY`, `REBASE_IF_NECESSARY`, `MERGE_ALWAYS` or `FAST_FORWARD_ONLY`, `REBASE_IF_NECESSARY`, `REBASE_ALWAYS`, `MERGE_ALWAYS` or
`CHERRY_PICK`. `CHERRY_PICK`.
|`strategy` |optional| |`strategy` |optional|
The strategy of the merge, can be `recursive`, `resolve`, The strategy of the merge, can be `recursive`, `resolve`,

8
Documentation/rest-api-projects.txt
View File

@ -2507,7 +2507,7 @@ limit] of this project as a link:#max-object-size-limit-info[
MaxObjectSizeLimitInfo] entity. MaxObjectSizeLimitInfo] entity.
|`submit_type` || |`submit_type` ||
The default submit type of the project, can be `MERGE_IF_NECESSARY`, The default submit type of the project, can be `MERGE_IF_NECESSARY`,
`FAST_FORWARD_ONLY`, `REBASE_IF_NECESSARY`, `MERGE_ALWAYS` or `FAST_FORWARD_ONLY`, `REBASE_IF_NECESSARY`, `REBASE_ALWAYS`, `MERGE_ALWAYS` or
`CHERRY_PICK`. `CHERRY_PICK`.
|`state` |optional| |`state` |optional|
The state of the project, can be `ACTIVE`, `READ_ONLY` or `HIDDEN`. + The state of the project, can be `ACTIVE`, `READ_ONLY` or `HIDDEN`. +
@ -2582,7 +2582,7 @@ If set to `0`, the max object size limit is removed. +
If not set, this setting is not updated. If not set, this setting is not updated.
|`submit_type` |optional| |`submit_type` |optional|
The default submit type of the project, can be `MERGE_IF_NECESSARY`, The default submit type of the project, can be `MERGE_IF_NECESSARY`,
`FAST_FORWARD_ONLY`, `REBASE_IF_NECESSARY`, `MERGE_ALWAYS` or `FAST_FORWARD_ONLY`, `REBASE_IF_NECESSARY`, `REBASE_ALWAYS`, `MERGE_ALWAYS` or
`CHERRY_PICK`. + `CHERRY_PICK`. +
If not set, the submit type is not updated. If not set, the submit type is not updated.
|`state` |optional| |`state` |optional|
@ -2870,8 +2870,8 @@ Whether a permission-only project should be created.
Whether an empty initial commit should be created. Whether an empty initial commit should be created.
|`submit_type` |optional| |`submit_type` |optional|
The submit type that should be set for the project The submit type that should be set for the project
(`MERGE_IF_NECESSARY`, `REBASE_IF_NECESSARY`, `FAST_FORWARD_ONLY`, (`MERGE_IF_NECESSARY`, `REBASE_IF_NECESSARY`, `REBASE_ALWAYS`,
`MERGE_ALWAYS`, `CHERRY_PICK`). + `FAST_FORWARD_ONLY`, `MERGE_ALWAYS`, `CHERRY_PICK`). +
If not set, `MERGE_IF_NECESSARY` is set as submit type unless If not set, `MERGE_IF_NECESSARY` is set as submit type unless
link:config-gerrit.html#repository.name.defaultSubmitType[ link:config-gerrit.html#repository.name.defaultSubmitType[
repository.<name>.defaultSubmitType] is set to a different value. repository.<name>.defaultSubmitType] is set to a different value.