From 9ed18a15e1800a56fcd53417e242a64c32748065 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Tue, 20 Jul 2021 21:53:03 +0000 Subject: [PATCH] Update maintainers, manpage and completions. Autogenerated by the [update-man-completions](https://github.com/Homebrew/brew/blob/HEAD/.github/workflows/update-man-completions.yml) workflow. --- completions/bash/brew | 2 ++ completions/fish/brew.fish | 2 ++ completions/zsh/_brew | 2 ++ docs/Manpage.md | 4 ++++ manpages/brew.1 | 8 ++++++++ 5 files changed, 18 insertions(+) diff --git a/completions/bash/brew b/completions/bash/brew index 8dac2cf2c1..17a282cd4f 100644 --- a/completions/bash/brew +++ b/completions/bash/brew @@ -1518,6 +1518,7 @@ _brew_pr_automerge() { --debug --help --ignore-failures + --no-autosquash --publish --quiet --tap @@ -1542,6 +1543,7 @@ _brew_pr_publish() { --debug --help --message + --no-autosquash --quiet --tap --verbose diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index 2fb4d530a1..78245fa06b 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -1049,6 +1049,7 @@ __fish_brew_complete_arg 'pr-automerge' -l autosquash -d 'Instruct `brew pr-publ __fish_brew_complete_arg 'pr-automerge' -l debug -d 'Display any debugging information' __fish_brew_complete_arg 'pr-automerge' -l help -d 'Show this message' __fish_brew_complete_arg 'pr-automerge' -l ignore-failures -d 'Include pull requests that have failing status checks' +__fish_brew_complete_arg 'pr-automerge' -l no-autosquash -d 'Instruct `brew pr-publish` to skip automatically reformatting and rewording commits in the pull request to the preferred format' __fish_brew_complete_arg 'pr-automerge' -l publish -d 'Run `brew pr-publish` on matching pull requests' __fish_brew_complete_arg 'pr-automerge' -l quiet -d 'Make some output more quiet' __fish_brew_complete_arg 'pr-automerge' -l tap -d 'Target tap repository (default: `homebrew/core`)' @@ -1064,6 +1065,7 @@ __fish_brew_complete_arg 'pr-publish' -l branch -d 'Branch to publish to (defaul __fish_brew_complete_arg 'pr-publish' -l debug -d 'Display any debugging information' __fish_brew_complete_arg 'pr-publish' -l help -d 'Show this message' __fish_brew_complete_arg 'pr-publish' -l message -d 'Message to include when autosquashing revision bumps, deletions, and rebuilds' +__fish_brew_complete_arg 'pr-publish' -l no-autosquash -d 'Skip automatically reformatting and rewording commits in the pull request to the preferred format, even if supported on the target tap' __fish_brew_complete_arg 'pr-publish' -l quiet -d 'Make some output more quiet' __fish_brew_complete_arg 'pr-publish' -l tap -d 'Target tap repository (default: `homebrew/core`)' __fish_brew_complete_arg 'pr-publish' -l verbose -d 'Make some output more verbose' diff --git a/completions/zsh/_brew b/completions/zsh/_brew index 544e5eb20a..bdceb6fd42 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -1290,6 +1290,7 @@ _brew_pr_automerge() { '--debug[Display any debugging information]' \ '--help[Show this message]' \ '--ignore-failures[Include pull requests that have failing status checks]' \ + '--no-autosquash[Instruct `brew pr-publish` to skip automatically reformatting and rewording commits in the pull request to the preferred format]' \ '--publish[Run `brew pr-publish` on matching pull requests]' \ '--quiet[Make some output more quiet]' \ '--tap[Target tap repository (default: `homebrew/core`)]' \ @@ -1307,6 +1308,7 @@ _brew_pr_publish() { '--debug[Display any debugging information]' \ '--help[Show this message]' \ '--message[Message to include when autosquashing revision bumps, deletions, and rebuilds]' \ + '--no-autosquash[Skip automatically reformatting and rewording commits in the pull request to the preferred format, even if supported on the target tap]' \ '--quiet[Make some output more quiet]' \ '--tap[Target tap repository (default: `homebrew/core`)]' \ '--verbose[Make some output more verbose]' \ diff --git a/docs/Manpage.md b/docs/Manpage.md index 60d15590fd..986b1135eb 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1176,6 +1176,8 @@ Find pull requests that can be automatically merged using `brew pr-publish`. Run `brew pr-publish` on matching pull requests. * `--autosquash`: Instruct `brew pr-publish` to automatically reformat and reword commits in the pull request to our preferred format. +* `--no-autosquash`: + Instruct `brew pr-publish` to skip automatically reformatting and rewording commits in the pull request to the preferred format. * `--ignore-failures`: Include pull requests that have failing status checks. @@ -1186,6 +1188,8 @@ Requires write access to the repository. * `--autosquash`: If supported on the target tap, automatically reformat and reword commits in the pull request to our preferred format. +* `--no-autosquash`: + Skip automatically reformatting and rewording commits in the pull request to the preferred format, even if supported on the target tap. * `--branch`: Branch to publish to (default: `master`). * `--message`: diff --git a/manpages/brew.1 b/manpages/brew.1 index 0e4658e11f..c23ea2a247 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1662,6 +1662,10 @@ Run \fBbrew pr\-publish\fR on matching pull requests\. Instruct \fBbrew pr\-publish\fR to automatically reformat and reword commits in the pull request to our preferred format\. . .TP +\fB\-\-no\-autosquash\fR +Instruct \fBbrew pr\-publish\fR to skip automatically reformatting and rewording commits in the pull request to the preferred format\. +. +.TP \fB\-\-ignore\-failures\fR Include pull requests that have failing status checks\. . @@ -1673,6 +1677,10 @@ Publish bottles for a pull request with GitHub Actions\. Requires write access t If supported on the target tap, automatically reformat and reword commits in the pull request to our preferred format\. . .TP +\fB\-\-no\-autosquash\fR +Skip automatically reformatting and rewording commits in the pull request to the preferred format, even if supported on the target tap\. +. +.TP \fB\-\-branch\fR Branch to publish to (default: \fBmaster\fR)\. .