diff --git a/Documentation/cmd-create-project.txt b/Documentation/cmd-create-project.txt index 503bd12630..4d1ea05450 100644 --- a/Documentation/cmd-create-project.txt +++ b/Documentation/cmd-create-project.txt @@ -102,6 +102,7 @@ Description values containing spaces should be quoted in single quotes * FAST_FORWARD_ONLY: produces a strictly linear history. * MERGE_IF_NECESSARY: create a merge 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. * CHERRY_PICK: always cherry-pick the commit. diff --git a/Documentation/cmd-set-project.txt b/Documentation/cmd-set-project.txt index 62d6e922d1..7282e287c0 100644 --- a/Documentation/cmd-set-project.txt +++ b/Documentation/cmd-set-project.txt @@ -53,6 +53,7 @@ Description values containing spaces should be quoted in single quotes * FAST_FORWARD_ONLY: produces a strictly linear history. * MERGE_IF_NECESSARY: create a merge 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. * CHERRY_PICK: always cherry-pick the commit. diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index eb5df61dab..f597ef1b74 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -3587,7 +3587,9 @@ Path must be absolute. + The default submit type for newly created projects. Supported values 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`. diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt index 008bc38d64..5c7fa19523 100644 --- a/Documentation/rest-api-changes.txt +++ b/Documentation/rest-api-changes.txt @@ -5817,7 +5817,7 @@ change. |Field Name ||Description |`submit_type` || 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`. |`strategy` |optional| The strategy of the merge, can be `recursive`, `resolve`, diff --git a/Documentation/rest-api-projects.txt b/Documentation/rest-api-projects.txt index bb41cb200b..6faa8261cf 100644 --- a/Documentation/rest-api-projects.txt +++ b/Documentation/rest-api-projects.txt @@ -2507,7 +2507,7 @@ limit] of this project as a link:#max-object-size-limit-info[ MaxObjectSizeLimitInfo] entity. |`submit_type` || 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`. |`state` |optional| 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. |`submit_type` |optional| 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`. + If not set, the submit type is not updated. |`state` |optional| @@ -2870,8 +2870,8 @@ Whether a permission-only project should be created. Whether an empty initial commit should be created. |`submit_type` |optional| The submit type that should be set for the project -(`MERGE_IF_NECESSARY`, `REBASE_IF_NECESSARY`, `FAST_FORWARD_ONLY`, -`MERGE_ALWAYS`, `CHERRY_PICK`). + +(`MERGE_IF_NECESSARY`, `REBASE_IF_NECESSARY`, `REBASE_ALWAYS`, +`FAST_FORWARD_ONLY`, `MERGE_ALWAYS`, `CHERRY_PICK`). + If not set, `MERGE_IF_NECESSARY` is set as submit type unless link:config-gerrit.html#repository.name.defaultSubmitType[ repository..defaultSubmitType] is set to a different value.