From 05765c7fceb69b431f2056d09d1639973489d157 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Wed, 9 Feb 2022 12:09:31 +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 | 10 +++++----- docs/Manpage.md | 4 ++-- manpages/brew.1 | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/completions/bash/brew b/completions/bash/brew index eff9443991..7fd9d533c2 100644 --- a/completions/bash/brew +++ b/completions/bash/brew @@ -1577,7 +1577,6 @@ _brew_pr_pull() { -*) __brewcomp " --artifact - --autosquash --branch-okay --clean --committer @@ -1587,6 +1586,7 @@ _brew_pr_pull() { --ignore-missing-artifacts --keep-old --message + --no-autosquash --no-commit --no-upload --quiet diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index 0bbeb7a43a..cf473b3fb5 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -1092,7 +1092,6 @@ __fish_brew_complete_arg 'pr-publish' -l workflow -d 'Target workflow filename ( __fish_brew_complete_cmd 'pr-pull' 'Download and publish bottles, and apply the bottle commit from a pull request with artifacts generated by GitHub Actions' __fish_brew_complete_arg 'pr-pull' -l artifact -d 'Download artifacts with the specified name (default: `bottles`)' -__fish_brew_complete_arg 'pr-pull' -l autosquash -d 'Automatically reformat and reword commits in the pull request to our preferred format' __fish_brew_complete_arg 'pr-pull' -l branch-okay -d 'Do not warn if pulling to a branch besides the repository default (useful for testing)' __fish_brew_complete_arg 'pr-pull' -l clean -d 'Do not amend the commits from pull requests' __fish_brew_complete_arg 'pr-pull' -l committer -d 'Specify a committer name and email in `git`\'s standard author format' @@ -1102,6 +1101,7 @@ __fish_brew_complete_arg 'pr-pull' -l help -d 'Show this message' __fish_brew_complete_arg 'pr-pull' -l ignore-missing-artifacts -d 'Comma-separated list of workflows which can be ignored if they have not been run' __fish_brew_complete_arg 'pr-pull' -l keep-old -d 'If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL' __fish_brew_complete_arg 'pr-pull' -l message -d 'Message to include when autosquashing revision bumps, deletions, and rebuilds' +__fish_brew_complete_arg 'pr-pull' -l no-autosquash -d 'Skip automatically reformatting and rewording commits in the pull request to our preferred format' __fish_brew_complete_arg 'pr-pull' -l no-commit -d 'Do not generate a new commit before uploading' __fish_brew_complete_arg 'pr-pull' -l no-upload -d 'Download the bottles but don\'t upload them' __fish_brew_complete_arg 'pr-pull' -l quiet -d 'Make some output more quiet' diff --git a/completions/zsh/_brew b/completions/zsh/_brew index 21aed6b5ff..fb2e9e33cb 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -1325,8 +1325,8 @@ _brew_pr_publish() { '--branch[Branch to publish to (default: `master`)]' \ '--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]' \ + '(--no-autosquash)--message[Message to include when autosquashing revision bumps, deletions, and rebuilds]' \ + '(--message)--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]' \ @@ -1337,16 +1337,16 @@ _brew_pr_publish() { _brew_pr_pull() { _arguments \ '--artifact[Download artifacts with the specified name (default: `bottles`)]' \ - '(--clean)--autosquash[Automatically reformat and reword commits in the pull request to our preferred format]' \ '--branch-okay[Do not warn if pulling to a branch besides the repository default (useful for testing)]' \ - '(--autosquash)--clean[Do not amend the commits from pull requests]' \ + '--clean[Do not amend the commits from pull requests]' \ '--committer[Specify a committer name and email in `git`'\''s standard author format]' \ '--debug[Display any debugging information]' \ '--dry-run[Print what would be done rather than doing it]' \ '--help[Show this message]' \ '--ignore-missing-artifacts[Comma-separated list of workflows which can be ignored if they have not been run]' \ '--keep-old[If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL]' \ - '--message[Message to include when autosquashing revision bumps, deletions, and rebuilds]' \ + '(--no-autosquash)--message[Message to include when autosquashing revision bumps, deletions, and rebuilds]' \ + '(--message)--no-autosquash[Skip automatically reformatting and rewording commits in the pull request to our preferred format]' \ '--no-commit[Do not generate a new commit before uploading]' \ '--no-upload[Download the bottles but don'\''t upload them]' \ '--quiet[Make some output more quiet]' \ diff --git a/docs/Manpage.md b/docs/Manpage.md index fd9154ed8c..eec4db2ba9 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1276,8 +1276,8 @@ Requires write access to the repository. Do not amend the commits from pull requests. * `--keep-old`: If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL. -* `--autosquash`: - 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 our preferred format. * `--branch-okay`: Do not warn if pulling to a branch besides the repository default (useful for testing). * `--resolve`: diff --git a/manpages/brew.1 b/manpages/brew.1 index 0714c125d4..a8bd5f78a5 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1810,8 +1810,8 @@ Do not amend the commits from pull requests\. If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL\. . .TP -\fB\-\-autosquash\fR -Automatically reformat and reword commits in the pull request to our preferred format\. +\fB\-\-no\-autosquash\fR +Skip automatically reformatting and rewording commits in the pull request to our preferred format\. . .TP \fB\-\-branch\-okay\fR