diff --git a/README.md b/README.md index bdcba7d8..dab37497 100644 --- a/README.md +++ b/README.md @@ -361,7 +361,12 @@ repository: # Either `true` to allow automatically deleting head branches # when pull requests are merged, or `false` to prevent automatic deletion. # Default: `false` - delete_branch_on_merge: true + delete_branch_on_merge: true + + # Either `true` to allow update branch on pull requests, + # or `false` to disallow update branch. + # Default: `false` + allow_update_branch: true # Whether to archive this repository. false will unarchive a previously archived repository. archived: false diff --git a/docs/sample-settings/settings.yml b/docs/sample-settings/settings.yml index f3dc0204..c05484de 100644 --- a/docs/sample-settings/settings.yml +++ b/docs/sample-settings/settings.yml @@ -81,7 +81,12 @@ # Either `true` to allow automatically deleting head branches # when pull requests are merged, or `false` to prevent automatic deletion. # Default: `false` - #delete_branch_on_merge: true + #delete_branch_on_merge: true + + # Either `true` to allow update branch on pull requests, + # or `false` to disallow update branch. + # Default: `false` + # allow_update_branch: true # The following attributes are applied to any repo within the org # So if a repo is not listed above is created or edited diff --git a/docs/sample-settings/suborg.yml b/docs/sample-settings/suborg.yml index 22432874..6221e83a 100644 --- a/docs/sample-settings/suborg.yml +++ b/docs/sample-settings/suborg.yml @@ -83,7 +83,12 @@ suborgteams: # Either `true` to allow automatically deleting head branches # when pull requests are merged, or `false` to prevent automatic deletion. # Default: `false` - #delete_branch_on_merge: true + #delete_branch_on_merge: true + + # Either `true` to allow update branch on pull requests, + # or `false` to disallow update branch. + # Default: `false` + # allow_update_branch: true # The following attributes are applied to any repo within the org # So if a repo is not listed above is created or edited