git-worktrees 0.5.0__tar.gz → 0.6.0__tar.gz

git_worktrees-0.6.0/.github/workflows/codeql.yml

@@ -0,0 +1,48 @@
+name: CodeQL
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  # New queries reach code nobody has pushed to.
+  schedule:
+    - cron: "17 4 * * 1"
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }}, ${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04, ubuntu-26.04]
+        language: [actions, python]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+
+      # Neither language compiles, so build-mode none reads the source as it
+      # is and nothing has to be installed first.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: none
+
+      # The category carries the runner, so the two uploads for one language
+      # are two analyses rather than one replacing the other.
+      - name: Analyze
+        uses: github/codeql-action/analyze@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
+        with:
+          category: /language:${{ matrix.language }}/os:${{ matrix.os }}

{git_worktrees-0.5.0 → git_worktrees-0.6.0}/.github/workflows/publish.yml

@@ -36,7 +36,7 @@ jobs:
   # byte-for-byte what was tested and installed here.
   build:
     name: Build
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       # Reading another workflow's runs. Without it the tests guard below
@@ -127,7 +127,7 @@ jobs:
 
   publish:
     name: Publish to PyPI
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     needs: build
     # Binds this job to the trusted publisher registered for `pypi`. Add a
     # required reviewer on this environment for a manual gate before anything
@@ -152,25 +152,27 @@ jobs:
           name: dist
           path: dist/
 
+      # Sign with this job's OIDC identity. uv uploads the attestations with
+      # their distributions.
+      - name: Attest
+        run: uvx pypi-attestations@0.0.30 sign dist/*
+
       - name: Publish
         run: uv publish --trusted-publishing always
 
-  # Uploaded and installable are two claims with two timings, so they are two
-  # jobs. An index serves what it has accepted only after a delay of its own
-  # choosing: 0.2.1 took longer than the script waited, and a release that had
-  # published correctly went red and had to be re-run by hand. This job holds
-  # the second claim, `release` needs only the first, and a red `verify` says
-  # PyPI is slow rather than that the version is not out.
+  # PyPI can take time to serve an accepted upload. Verification runs in a
+  # separate job so that delay does not block the GitHub release.
   verify:
-    name: Verify it installs from PyPI
-    runs-on: ubuntu-26.04
+    name: Verify PyPI install and attestations (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04, ubuntu-26.04]
     needs: publish
     permissions:
       contents: read
     steps:
-      # The script reads the name and version from pyproject.toml through
-      # `uv version`, and installs from the index rather than from the
-      # artifact, so there is nothing to download here.
       - name: Checkout code
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
 
@@ -183,9 +185,24 @@ jobs:
       - name: Verify it installs from PyPI
         run: scripts/verify-publish.bash --prod
 
+      # The filenames identify the distributions to fetch from PyPI.
+      - name: Download distributions
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
+        with:
+          name: dist
+          path: dist/
+
+      # The install check waits for PyPI to serve the files.
+      - name: Verify attestations on PyPI
+        run: |
+          for f in dist/*.whl dist/*.tar.gz; do
+            uvx pypi-attestations@0.0.30 verify pypi \
+              --repository "https://github.com/$GITHUB_REPOSITORY" "pypi:${f#dist/}"
+          done
+
   release:
     name: Release
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     needs: publish
     permissions:
       contents: write

{git_worktrees-0.5.0 → git_worktrees-0.6.0}/.github/workflows/testpypi.yml

@@ -28,7 +28,7 @@ permissions:
 jobs:
   snapshot:
     name: Publish a snapshot
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     # Binds this job to the trusted publisher registered for `testpypi`.
     environment: testpypi
     permissions:
@@ -59,6 +59,11 @@ jobs:
       - name: Build
         run: uv build
 
+      # Sign with this job's OIDC identity. uv uploads the attestations with
+      # their distributions.
+      - name: Attest
+        run: uvx pypi-attestations@0.0.30 sign dist/*
+
       - name: Publish
         # `always` rather than the default `automatic`: fail loudly if OIDC is
         # unavailable instead of quietly looking for a token.

{git_worktrees-0.5.0 → git_worktrees-0.6.0}/.github/workflows/tests.yml

@@ -22,8 +22,12 @@ concurrency:
 
 jobs:
   lint:
-    name: Lint
-    runs-on: ubuntu-26.04
+    name: Lint (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04, ubuntu-26.04]
     steps:
       - name: Checkout code
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
@@ -33,7 +37,7 @@ jobs:
         with:
           python-version: "3.14"
           enable-cache: true
-          cache-suffix: ${{ github.workflow }}-${{ github.job }}
+          cache-suffix: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
       - name: Install dependencies
         run: uv sync --all-extras --locked
@@ -44,13 +48,14 @@ jobs:
         run: uv run --no-sync pre-commit run --all-files --show-diff-on-failure
 
   test:
-    name: Python ${{ matrix.python-version }}
-    runs-on: ubuntu-26.04
+    name: Python ${{ matrix.python-version }} (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
     strategy:
       # One version failing is a fact about that version, so let the others
       # finish and say which.
       fail-fast: false
       matrix:
+        os: [ubuntu-24.04, ubuntu-26.04]
         python-version: ["3.11", "3.12", "3.13", "3.14"]
 
     steps:
@@ -67,7 +72,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           enable-cache: true
-          cache-suffix: ${{ github.workflow }}-${{ github.job }}
+          cache-suffix: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
       - name: Install dependencies
         # --locked fails the run on a stale uv.lock, rather than quietly

{git_worktrees-0.5.0 → git_worktrees-0.6.0}/AGENTS.md

@@ -40,7 +40,7 @@ function too, so this is the agent path as much as the human one.
 
 | | changes directory | ships as |
 | --- | --- | --- |
-| `gws`, `gwp`, `gwbs`, `gwbd`, `gwnb`, `gwrot`, `gwh` | no | a console script, and nothing else |
+| `gws`, `gwp`, `gwbs`, `gwbd`, `gwbc`, `gwrot`, `gwh` | no | a console script, and nothing else |
 | a command that lands you somewhere | yes | a console script, plus a function of the same name |
 
 A binary cannot `cd` its caller. That is the only thing shell code is here for,
@@ -75,18 +75,18 @@ It calls the `gwr` function rather than `command gwr`, so the caller still
 lands where the binary says, and it has no console script of its own.
 `SHORTCUTS` in `tests/test_shims.py` lists them and holds each to one line.
 
-## Two commands are alpha
+## Two commands start branches
 
-`gwnb` and `gwrot` start branches, not worktrees. `origin new-branch` and
-`origin rotate` do the same job, only one of the two sets survives, and
-nothing has decided which. So they match `origin` rather than improve on it:
-the name format, the stem-stripping and the remote-aware collision check are
-copied, and a difference between them is a decision somebody has to make
-later. Say so wherever they are documented.
+`gwbc` and `gwrot` start branches, not worktrees, and do the job
+`origin new-branch` and `origin rotate` do. The name format, the
+stem-stripping and the remote-aware collision check are the same in both, so
+a branch either one names is one the other would have named.
 
-Exit codes are the one deliberate divergence. `origin` has a single non-zero
-code and draws no line between a usage error and a runtime one; this CLI
-keeps argparse's 2 for a usage error.
+Two divergences are deliberate. `origin` has a single non-zero exit code and
+draws no line between a usage error and a runtime one; this CLI keeps
+argparse's 2 for a usage error. And `gwrot` refuses, at exit 1, a rotation or
+catch-up that would change nothing, where `origin rotate` makes a branch at
+the same commit under a new name.
 
 ## Where shell code goes
 
@@ -240,12 +240,33 @@ on a terminal: both are what a script reads. The colour is applied at the
 call site that formats a table, and neither path passes a code to one.
 
 `progress.py` draws a spinner on stderr and one line saying what is being
-checked, while `gws`, `gwp` and `gwr` fetch and judge. It runs only when
+checked, while `gws`, `gwp`, `gwr`, `gwbs` and `gwbd` fetch and judge. It runs only when
 stderr is a terminal that can clear a line, and never under `-q` or `-v`,
 since the verbose log writes to the line it redraws. Anything else printed on
 stderr while it spins goes through `progress.line`, which clears the spinner
 first.
 
+Every message on stderr goes through `render.fail`, `render.warn` or
+`render.note`, a usage error and a cancelled picker included. On a terminal
+each leads with its symbol, `✗`, `!` or `→`, and its first line makes flags
+and quoted commands bold, paths dim and shas yellow. A path is a word that
+starts with `/`, `~/`, `./` or `../`, taken whole, so a directory named `-x`
+is not a flag and a uuid inside one is not a sha. A failure prints every line
+red; a warning or a note dims the lines after its first.
+
+A branch name is wrapped in `render.branch` and a ref such as `origin/main` in
+`render.ref` where the message is built, since no pattern tells a branch from
+prose; the passes after leave those alone. A branch is bold magenta wherever
+it prints: a table, the picker, a message, a result line. A prompt is
+`render.ask`, the question bold and the answers it takes dim. The line that
+puts a branch back is `render.restore`, painted the way a table paints a
+branch and a sha, and it pastes the same. Off a terminal it is the words
+alone, so a test or a log reads what the code wrote. `-v` prints each command once it has run, as
+`render.trace` lays it out: the line that pastes back, what it printed,
+indented, its exit code when that is not 0 or is the only answer, then a
+blank line. Printing after the run keeps a command and its answer together
+when eight threads are asking at once.
+
 ## A recent fetch, and a forge answer that cannot change, are reused
 
 The README's "What is reused, and for how long" table lists every case and

{git_worktrees-0.5.0 → git_worktrees-0.6.0}/CHANGELOG.md

@@ -17,6 +17,68 @@ not in here, whatever it cost to build.
 A release closes with a `### Choices` section when a decision in it is worth
 the reader's time: what was chosen, and what the alternative failed to do.
 
+## 0.6.0 - 2026-11-02
+
+### Changed
+
+`gwnb` is now `gwbc`, and `gw new-branch` is now `gw branch create`. Update
+the fish or zsh plugin so the new name completes. `gwbc` and `gwrot` are no
+longer marked alpha.
+
+`gwrot` prints the branch it left and the one it is on now, each with its
+commit, and exits 1 when a rotation or catch-up would change nothing.
+
+On a terminal, every command colours its output the same way: errors red
+behind ✗, warnings behind !, notes behind →, branches bold magenta, refs
+blue, commits yellow, paths dim, and each verdict in one colour wherever it
+appears. Piped or redirected output, and any run with `NO_COLOR` set, stays
+plain.
+
+`gwl`, `gws`, `gwp` and `gwr` list the main checkout first, then the other
+worktrees from oldest to newest.
+
+`-v` prints each git and `gh` command after it runs, with what it printed and
+its exit code indented beneath it.
+
+`gwp` names the worktrees it removed.
+
+### Added
+
+`gws` and `gwbs` take `--only VERDICT`, repeatable, to show only the rows
+marked `remove`, `keep` or `unknown`, in the table and in `--json`. The counts
+under the table still cover every row. Both also take `-f` for
+`--force-refresh`.
+
+`gwrot -f` is short for `gwrot --force-refresh`.
+
+`gwbd` shows each branch's verdict in its selector and in the list it prints
+before asking, and a `--dry-run` ends by saying how many branches would go.
+
+`gwbs` and `gwbd` show a spinner on stderr while they judge, with a line
+naming the branch, the check in progress and how far through the list they
+are, such as `fix-parser: was it squash-merged into main? (4 of 18)`. `gwbd`
+keeps it running while it rechecks each branch before deleting it. It stays
+off when stderr is not a terminal, on `TERM=dumb`, and under `-q` or `-v`.
+
+`gwl` names each remote above the picker as host and path, such as
+`origin: github.com/org/repo`, for SSH and HTTPS remotes alike and without
+any user name or token the URL carries.
+
+### Fixed
+
+`gwbd` says why it kept each branch it was asked to delete, rather than
+exiting 3 with nothing printed.
+
+## 0.5.1 - 2026-09-29
+
+### Added
+
+The wheel and source distribution on PyPI carry PEP 740 attestations signed
+by the GitHub workflow that built them. PyPI shows the provenance on the
+release's page, and `uvx pypi-attestations verify pypi --repository
+https://github.com/MihaiBojin/worktrees pypi:<file>` checks a file against
+this repository before you install it.
+
 ## 0.5.0 - 2026-09-29
 
 ### Added

git_worktrees-0.6.0/Makefile

@@ -0,0 +1,9 @@
+.PHONY: local-install reset
+
+# The working copy, in place of anything published.
+local-install:
+	uv tool install --force --from . git-worktrees
+
+# Undoes local-install: the latest release from PyPI, and only its commands.
+reset:
+	uv tool install --force git-worktrees

{git_worktrees-0.5.0 → git_worktrees-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: git-worktrees
-Version: 0.5.0
+Version: 0.6.0
 Summary: Git worktree commands that refuse to lose work.
 Project-URL: Bug reports, https://github.com/MihaiBojin/worktrees/issues/new
 Project-URL: Source, https://github.com/MihaiBojin/worktrees
@@ -8,7 +8,7 @@ Author-email: Mihai Bojin <557584+MihaiBojin@users.noreply.github.com>
 License-Expression: Apache-2.0
 License-File: LICENSE
 Keywords: cli,git,worktree
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
@@ -31,7 +31,7 @@ Description-Content-Type: text/markdown
 
 Git worktree commands that refuse to lose work.
 
-`gws`, `gwp`, `gwbs`, `gwbd`, `gwnb`, `gwrot`, and `gwh` run as console
+`gws`, `gwp`, `gwbs`, `gwbd`, `gwbc`, `gwrot`, and `gwh` run as console
 scripts. `gwa`, `gwl`, `gwm`, and `gwr` change the caller's directory and need
 a shell function of the same name.
 
@@ -46,8 +46,8 @@ a shell function of the same name.
 | `gwm NEW` | rename this worktree's branch and move the checkout to match |
 | `gwr [QUERY]` | remove a worktree whose branch is finished, and the branch |
 | `gwr! [QUERY]` | `gwr --delete-ignored`, a shell function in fish and zsh |
-| `gwnb NAME` | alpha. Fetch, then branch `NAME` off the head branch and check it out |
-| `gwrot` | alpha. Start the next branch after this one, or catch the head branch up |
+| `gwbc NAME` | fetch, then branch `NAME` off the head branch and check it out |
+| `gwrot` | start the next branch after this one, or catch the head branch up |
 | `gwh` | print that table, with every name each command answers to |
 
 `gw` takes the same commands as subcommands, each with shorthands, so `gwl`,
@@ -63,7 +63,7 @@ a shell function of the same name.
 | `gwl` | `gw list`, `ls`, `l` |
 | `gwm` | `gw move`, `mv`, `m` |
 | `gwr` | `gw remove`, `rm` |
-| `gwnb` | `gw new-branch`, `nb`, `new` |
+| `gwbc` | `gw branch create` |
 | `gwrot` | `gw rotate`, `rot` |
 | `gwh` | `gw help`, `h`, and `gw` with no subcommand |
 
@@ -80,11 +80,8 @@ a worktree.
 
 `gws` and `gwp` are what this tool is for and their behaviour is settled.
 
-**`gwnb` and `gwrot` are alpha and may go.** They start branches rather than
-worktrees, which is a different job from the one this repository exists to do,
-and `origin new-branch` and `origin rotate` already do it. Only one of the two
-sets survives. Until that is decided the names, the flags and the output may
-change, and nothing should be built on top of them.
+`gwbc` and `gwrot` start branches rather than worktrees: `gwbc` one you
+name, `gwrot` the next in a series.
 
 ## Two holes in git
 
@@ -131,7 +128,7 @@ Python 3.11 or newer, and no dependencies. The standard library answers every
 question this asks, so an invocation pays for the interpreter and nothing
 else.
 
-That installs `gws`, `gwp`, `gwbs`, `gwbd`, `gwnb`, `gwrot`, and `gwh`. The
+That installs `gws`, `gwp`, `gwbs`, `gwbd`, `gwbc`, `gwrot`, and `gwh`. The
 four that land you somewhere need a shell function too, and every command has
 a completion, both of which arrive through a plugin manager.
 
@@ -165,7 +162,7 @@ autoload -Uz compinit && compinit
 Each function runs `command <name>` and `cd`s to what it printed, provided
 that is a directory. `--json` and `--list` print what was asked for on the
 same stream a destination arrives on, so the shim asks whether what it has is
-somewhere to go and stays put when it is not. `gws`, `gwp`, `gwnb`, `gwrot` and `gwh`
+somewhere to go and stays put when it is not. `gws`, `gwp`, `gwbc`, `gwrot` and `gwh`
 change no directory, so they ship as console scripts alone and answer the same
 from a prompt and from a script.
 
@@ -256,7 +253,7 @@ $ gwp
 squash-merged  /home/you/git/.worktrees/squash-merged/repo
   restore with: git branch squash-merged a2b41ad1fb271bd7d84256f0d35ee5d58c29dd08
 remove 1 worktree(s)? [y/N] y
-removed 1 worktree(s)
+removed 1 worktree(s): squash-merged
 ```
 
 It removes exactly the rows `gws` marks `remove`, under the same flags, and one
@@ -367,6 +364,7 @@ asks, however many there are:
 
 ```console
 $ gwl                # standing in never-pushed
+origin: github.com/you/repo
   #  WORKTREE       BRANCH         PATH
   *  never-pushed   never-pushed   /home/you/git/.worktrees/never-pushed/repo
 > 1  repo           main           /home/you/git/repo
@@ -375,6 +373,15 @@ $ gwl                # standing in never-pushed
 which? [up/down and enter, 1-3, or esc to cancel]
 ```
 
+The lines above the table name each remote and where it fetches from, as
+host and path: `git@github.com:you/repo.git` and
+`https://github.com/you/repo.git` are both `github.com/you/repo`, and a user,
+token or port in the URL is not shown. `--list` and `--json` leave them out.
+
+Rows run in the order the worktrees were made, the main checkout first and
+the newest last. git keeps no date, so it is read off the file `git worktree
+add` writes into `.git/worktrees/` and nothing changes afterwards.
+
 WORKTREE is the directory under `.worktrees`, or the main checkout's own
 directory name. It parts from BRANCH when somebody switches branch inside a
 worktree. Up and down move the highlight, enter takes it, a digit takes that
@@ -421,13 +428,12 @@ deleted, under `--delete-ignored` and under `--force` alike.
 to lose. It is a shell function in fish and zsh, not a console script, and it
 calls the `gwr` function so you still land where `gwr` says.
 
-## gwnb and gwrot (alpha)
+## gwbc and gwrot
 
-Both are alpha and both start branches rather than worktrees. See the note
-under the command table.
+Both start branches rather than worktrees.
 
 ```console
-$ gwnb fix-parser
+$ gwbc fix-parser
 fix-parser from origin/main at 4a91c02
 ```
 
@@ -454,36 +460,56 @@ Three digits, so the sequence cannot be read as another field of the date. A
 number is free only when neither `refs/heads/` nor the remote holds it, or
 two people rotate into the same name.
 
+It prints the branch it left and the one it made, each with its commit:
+
+```console
+$ gwrot
+was  fix-parser                 6d45e4f  kept, 1 commit not on origin/main
+now  fix-parser-2026-09-11_001  910074d  new, from origin/main
+```
+
+A branch already at the head branch with no commits of its own is refused at
+exit 1, because the next branch would be the same commit under another name.
+Running `gwrot` twice without committing in between is how that happens.
+`origin rotate` makes the branch anyway; this is the second place the two
+differ, after exit codes.
+
 On the head branch there is no chain to continue, so it catches that up
 instead:
 
 ```console
 $ gwrot
-main is at origin/main
+was  main  6d45e4f
+now  main  910074d  fast-forwarded by 3 commits to origin/main
 ```
 
+A head branch already level with the remote is refused at exit 1 too, since
+there is nothing to catch up.
+
 That is `merge --ff-only`, never a rebase: rewriting local commits on the
 head branch is the class this tooling refuses everywhere else. Commits the
 remote does not have are refused and listed, because they are a change of
-their own and `gwnb` puts them on a branch.
+their own and `gwbc` puts them on a branch.
 
 ## gwh
 
 ```console
 $ gwh
-worktrees 0.2.0: git worktree commands that refuse to lose work
-
-COMMAND          GW                       DOES
-gws              gw status (s, st)        which worktrees are finished, and why
-gwp              gw prune (p)             remove the ones status marks removable
-gwa NAME [BASE]  gw add (a)               create a worktree and land you in it
-gwl [QUERY]      gw list (l, ls)          pick a worktree and land you in it
-gwm NEW          gw move (m, mv)          rename this branch and move it
-gwr [QUERY]      gw remove (rm)           remove one whose branch is finished
-gwnb NAME        gw new-branch (nb, new)  branch off the head branch (alpha)
-gwrot            gw rotate (rot)          the next branch in a series (alpha)
-gwh              gw help (h)              every command and alias, this list
-—                gw version (v)           the version this package installs
+worktrees 0.5.1: git worktree commands that refuse to lose work
+
+COMMAND          GW                 DOES
+gws              gw status (s, st)  which worktrees are finished, and why
+gwp              gw prune (p)       remove the ones status marks removable
+gwa NAME [BASE]  gw add (a)         create a worktree and land you in it
+gwl [QUERY]      gw list (l, ls)    pick a worktree and land you in it
+gwm NEW          gw move (m, mv)    rename this branch and move it
+gwr [QUERY]      gw remove (rm)     remove one whose branch is finished
+gwrot            gw rotate (rot)    the next branch in a series
+gwh              gw help (h)        every command and alias, this list
+—                gw version (v)     the version this package installs
+gwbc NAME        gw branch create   branch off the head branch
+gwbs [NAME ...]  gw branch status   which branches are finished, and why
+gwbd [NAME ...]  gw branch delete   delete local branches proved finished
 ```
 
 `gw help`, `gw h` and `gw` with no subcommand print the same thing. One table
@@ -499,19 +525,27 @@ print one thing each and have nothing to be quiet about, takes `--json`, `-q`,
 
 | | |
 | --- | --- |
-| `gws` | `--branch NAME`, `--no-fetch`, `--force-refresh`, `--delete-ignored`, `--no-forge` |
-| `gwp` | those five, and `-y` |
+| `gws` | `--branch NAME`, `--no-fetch`, `-f`/`--force-refresh`, `--delete-ignored`, `--no-forge`, `--only VERDICT` |
+| `gwp` | `--branch NAME`, `--no-fetch`, `--force-refresh`, `--delete-ignored`, `--no-forge`, and `-y` |
 | `gwr` | `-f`, `--delete-ignored`, `--no-fetch`, `--force-refresh`, `--no-forge`, `-y` |
-| `gwa`, `gwnb`, `gwrot` | `--no-fetch`, `--force-refresh` |
-| `gwbs` | `--no-fetch`, `--force-refresh`, `--no-forge` |
-| `gwbd` | those three, `--all`, `--dry-run` and `-y` |
+| `gwa`, `gwbc` | `--no-fetch`, `--force-refresh` |
+| `gwrot` | `--no-fetch`, `-f`/`--force-refresh` |
+| `gwbs` | `--no-fetch`, `-f`/`--force-refresh`, `--no-forge`, `--only VERDICT` |
+| `gwbd` | `--no-fetch`, `--force-refresh`, `--no-forge`, `--all`, `--dry-run` and `-y` |
 | `gwl` | `-l` |
 | `gwm`, `gwh` | none |
 
+`--only` takes `remove`, `keep` or `unknown` and can be given more than
+once. It narrows the table and `--json`; the counts under the table still
+cover every row. `-f` is on the two status commands only, since on `gwp` and
+`gwbd` it would read as forcing a removal.
+
 `gw <command> --help` prints one command's own list.
 
-While `gws`, `gwp` and `gwr` fetch and judge, a spinner on stderr names the
-branch and the check in progress.
+While `gws`, `gwp`, `gwr`, `gwbs` and `gwbd` fetch and judge, a spinner on
+stderr names the branch and the check in progress. `gwbs` and `gwbd` judge one
+branch at a time, so their line also counts how far through the list they are:
+`fix-parser: was it squash-merged into main? (4 of 18)`.
 
 ### What is reused, and for how long
 
@@ -521,7 +555,7 @@ is kept, and `--no-fetch` never fetches.
 
 | what | when | reused for |
 | --- | --- | --- |
-| a fetch, by `gws`, `gwp`, `gwr`, `gwbs`, `gwbd`, `gwa`, `gwnb`, `gwrot` | from any worktree of the repository | 10 minutes; the command says how old it is |
+| a fetch, by `gws`, `gwp`, `gwr`, `gwbs`, `gwbd`, `gwa`, `gwbc`, `gwrot` | from any worktree of the repository | 10 minutes; the command says how old it is |
 | a request, merged or closed | on the commit it was asked about | until `--force-refresh` |
 | a request, open | a draft, a conflict, or on GitLab a needed rebase, with no auto-merge and no check running | 10 minutes |
 | a request, open | auto-merge or merge-when-pipeline-succeeds set | never |
@@ -562,7 +596,7 @@ squash-merged
 $ fish -c 'gws --json' | jq '.verdicts | length'
 4
 
-$ bash -c 'gwnb spike --json' | jq -r .base
+$ bash -c 'gwbc spike --json' | jq -r .base
 refs/remotes/origin/main
 ```