Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
docs(step): correct squash --stage=none and prune skip-list help (#4268)
Worktrunk Bot8e4f8535fb4c
diff --git a/docs/src/content/docs/step.md b/docs/src/content/docs/step.mdindex 303b86cf4..d1ed1d075 100644--- a/docs/src/content/docs/step.md+++ b/docs/src/content/docs/step.md@@ -213,7 +213,7 @@ Controls what to stage before squashing:|-------|----------|| `all` | Stage all changes including untracked files (default) || `tracked` | Stage only modified tracked files |-| `none` | Don't stage anything, squash only committed changes |+| `none` | Don't stage anything; squash commits plus what's already staged |```console$ wt step squash --stage=none@@ -817,7 +817,7 @@ Bulk-removes worktrees and branches that are integrated into the default branch,In `wt list`, candidates show `_` (same commit) or `⊂` (content integrated). Run `--dry-run` to preview. See `wt remove --help` for the full integration criteria.-Locked worktrees and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).+Locked worktrees, worktrees with uncommitted changes, and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).### Min-age guarddiff --git a/plugins/worktrunk/skills/worktrunk/reference/step.md b/plugins/worktrunk/skills/worktrunk/reference/step.mdindex 99c397072..9ed9c7107 100644--- a/plugins/worktrunk/skills/worktrunk/reference/step.md+++ b/plugins/worktrunk/skills/worktrunk/reference/step.md@@ -201,7 +201,7 @@ Controls what to stage before squashing:|-------|----------|| `all` | Stage all changes including untracked files (default) || `tracked` | Stage only modified tracked files |-| `none` | Don't stage anything, squash only committed changes |+| `none` | Don't stage anything; squash commits plus what's already staged |```console$ wt step squash --stage=none@@ -805,7 +805,7 @@ Bulk-removes worktrees and branches that are integrated into the default branch,In `wt list`, candidates show `_` (same commit) or `⊂` (content integrated). Run `--dry-run` to preview. See `wt remove --help` for the full integration criteria.-Locked worktrees and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).+Locked worktrees, worktrees with uncommitted changes, and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).### Min-age guarddiff --git a/skills/worktrunk/reference/step.md b/skills/worktrunk/reference/step.mdindex 99c397072..9ed9c7107 100644--- a/skills/worktrunk/reference/step.md+++ b/skills/worktrunk/reference/step.md@@ -201,7 +201,7 @@ Controls what to stage before squashing:|-------|----------|| `all` | Stage all changes including untracked files (default) || `tracked` | Stage only modified tracked files |-| `none` | Don't stage anything, squash only committed changes |+| `none` | Don't stage anything; squash commits plus what's already staged |```console$ wt step squash --stage=none@@ -805,7 +805,7 @@ Bulk-removes worktrees and branches that are integrated into the default branch,In `wt list`, candidates show `_` (same commit) or `⊂` (content integrated). Run `--dry-run` to preview. See `wt remove --help` for the full integration criteria.-Locked worktrees and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).+Locked worktrees, worktrees with uncommitted changes, and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).### Min-age guarddiff --git a/src/cli/step.rs b/src/cli/step.rsindex 8a8a39980..64765958d 100644--- a/src/cli/step.rs+++ b/src/cli/step.rs@@ -144,7 +144,7 @@ Controls what to stage before squashing:|-------|----------|| `all` | Stage all changes including untracked files (default) || `tracked` | Stage only modified tracked files |-| `none` | Don't stage anything, squash only committed changes |+| `none` | Don't stage anything; squash commits plus what's already staged |```console$ wt step squash --stage=none@@ -619,7 +619,7 @@ Gitignored files (build artifacts, `node_modules/`, `.env`) are swapped along wiIn `wt list`, candidates show `_` (same commit) or `⊂` (content integrated). Run `--dry-run` to preview. See `wt remove --help` for the full integration criteria.-Locked worktrees and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).+Locked worktrees, worktrees with uncommitted changes, and the main worktree are always skipped. The current worktree is removed last, triggering cd to the primary worktree. Pre-remove and post-remove hooks run for each removal; a candidate whose hooks include an unapproved project command is skipped with `(approval required)` (pre-approve with `wt config approvals add`, or pass `--yes`).## Min-age guard