שתף באמצעות


az repos policy merge-strategy

Note

This reference is part of the azure-devops extension for the Azure CLI (version 2.30.0 or higher). The extension will automatically install the first time you run an az repos policy merge-strategy command. Learn more about extensions.

Manage merge strategy policy.

Commands

Name Description Type Status
az repos policy merge-strategy create

Create merge strategy policy.

Extension GA
az repos policy merge-strategy update

Update merge strategy policy.

Extension GA

az repos policy merge-strategy create

Create merge strategy policy.

az repos policy merge-strategy create --blocking {false, true}
                                      --branch
                                      --enabled {false, true}
                                      --repository-id
                                      [--allow-no-fast-forward {false, true}]
                                      [--allow-rebase {false, true}]
                                      [--allow-rebase-merge {false, true}]
                                      [--allow-squash {false, true}]
                                      [--branch-match-type {exact, prefix}]
                                      [--detect {false, true}]
                                      [--org]
                                      [--project]
                                      [--use-squash-merge {false, true}]

Required Parameters

--blocking

Whether the policy should be blocking or not.

Accepted values: false, true
--branch

Branch on which this policy should be applied. For example: master.

--enabled

Whether the policy is enabled or not.

Accepted values: false, true
--repository-id

Id of the repository on which to apply the policy.

Optional Parameters

--allow-no-fast-forward

Basic merge (no fast-forward) - Preserves nonlinear history exactly as it happened during development.

Accepted values: false, true
--allow-rebase

Rebase and fast-forward - Creates a linear history by replaying the source branch commits onto the target without a merge commit.

Accepted values: false, true
--allow-rebase-merge

Rebase with merge commit - Creates a semi-linear history by replaying the source branch commits onto the target and then creating a merge commit.

Accepted values: false, true
--allow-squash

Squash merge - Creates a linear history by condensing the source branch commits into a single new commit on the target branch.

Accepted values: false, true
--branch-match-type

Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.

Accepted values: exact, prefix
Default value: exact
--detect

Automatically detect organization.

Accepted values: false, true
--org --organization

Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.

--project -p

Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.

--use-squash-merge
Deprecated

Option '--use-squash-merge' has been deprecated and will be removed in a future release. Use '--allow-squash' instead.

Whether to squash merge always. This option does not work for allowing other merge types.

Accepted values: false, true
Global Parameters
--debug

Increase logging verbosity to show all debug logs.

--help -h

Show this help message and exit.

--only-show-errors

Only show errors, suppressing warnings.

--output -o

Output format.

Accepted values: json, jsonc, none, table, tsv, yaml, yamlc
Default value: json
--query

JMESPath query string. See http://jmespath.org/ for more information and examples.

--subscription

Name or ID of subscription. You can configure the default subscription using az account set -s NAME_OR_ID.

--verbose

Increase logging verbosity. Use --debug for full debug logs.

az repos policy merge-strategy update

Update merge strategy policy.

az repos policy merge-strategy update --id
                                      [--allow-no-fast-forward {false, true}]
                                      [--allow-rebase {false, true}]
                                      [--allow-rebase-merge {false, true}]
                                      [--allow-squash {false, true}]
                                      [--blocking {false, true}]
                                      [--branch]
                                      [--branch-match-type {exact, prefix}]
                                      [--detect {false, true}]
                                      [--enabled {false, true}]
                                      [--org]
                                      [--project]
                                      [--repository-id]
                                      [--use-squash-merge {false, true}]

Required Parameters

--id --policy-id

ID of the policy.

Optional Parameters

--allow-no-fast-forward

Basic merge (no fast-forward) - Preserves nonlinear history exactly as it happened during development.

Accepted values: false, true
--allow-rebase

Rebase and fast-forward - Creates a linear history by replaying the source branch commits onto the target without a merge commit.

Accepted values: false, true
--allow-rebase-merge

Rebase with merge commit - Creates a semi-linear history by replaying the source branch commits onto the target and then creating a merge commit.

Accepted values: false, true
--allow-squash

Squash merge - Creates a linear history by condensing the source branch commits into a single new commit on the target branch.

Accepted values: false, true
--blocking

Whether the policy should be blocking or not.

Accepted values: false, true
--branch

Branch on which this policy should be applied. For example: master.

--branch-match-type

Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.

Accepted values: exact, prefix
--detect

Automatically detect organization.

Accepted values: false, true
--enabled

Whether the policy is enabled or not.

Accepted values: false, true
--org --organization

Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.

--project -p

Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.

--repository-id

Id of the repository on which to apply the policy.

--use-squash-merge
Deprecated

Option '--use-squash-merge' has been deprecated and will be removed in a future release. Use '--allow-squash' instead.

Whether to squash merge always. This option does not work for allowing other merge types.

Accepted values: false, true
Global Parameters
--debug

Increase logging verbosity to show all debug logs.

--help -h

Show this help message and exit.

--only-show-errors

Only show errors, suppressing warnings.

--output -o

Output format.

Accepted values: json, jsonc, none, table, tsv, yaml, yamlc
Default value: json
--query

JMESPath query string. See http://jmespath.org/ for more information and examples.

--subscription

Name or ID of subscription. You can configure the default subscription using az account set -s NAME_OR_ID.

--verbose

Increase logging verbosity. Use --debug for full debug logs.