Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

docs: Refine CLI help descriptions for clarity

Maximilian Roosea011e4438fc
diff --git a/CLAUDE.md b/CLAUDE.md
index 967b605f4..f882b1198 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -71,7 +71,6 @@ Keep the first line of flag and argument descriptions brief—aim for 3-6 words.
**Bad examples (too verbose):**
- `/// Auto-approve project commands without saving approvals.`
-- `/// Run as if worktrunk was started in <path> instead of the current working directory`
- `/// Show CI status, conflict detection, and complete diff statistics`
The help text should be scannable. Users reading `wt switch --help` need to quickly understand what each flag does without parsing long sentences.
diff --git a/README.md b/README.md
index 87b7dfbaa..af3772701 100644
--- a/README.md
+++ b/README.md
@@ -412,6 +412,7 @@ wt switch --create new-feature --base=^ # Branch from main (default)
wt switch --create bugfix --base=@ # Branch from current HEAD
wt remove @ # Remove current worktree
```
+```
<!-- README:end -->
</details>
diff --git a/src/cli.rs b/src/cli.rs
index 29d01d1db..b6948c747 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -100,7 +100,7 @@ pub enum OutputFormat {
after_long_help = r#"See `wt config --help` for configuration file locations and setup."#
)]
pub struct Cli {
- /// Change working directory
+ /// Working directory for this command
#[arg(
short = 'C',
global = true,
diff --git a/tests/snapshots/integration__integration_tests__help__help_beta.snap b/tests/snapshots/integration__integration_tests__help__help_beta.snap
index 6259d0623..e3a7eda80 100644
--- a/tests/snapshots/integration__integration_tests__help__help_beta.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_beta.snap
@@ -26,7 +26,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_config.snap b/tests/snapshots/integration__integration_tests__help__help_config.snap
index af065aa3f..946f7fa6c 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config.snap
@@ -31,7 +31,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
index 670243bdc..6fd59ee9a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
@@ -28,7 +28,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals_ask.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals_ask.snap
index 38e738f5c..87493c79a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals_ask.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals_ask.snap
@@ -31,7 +31,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap
index 62bb5d24f..e2a7a08c6 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap
@@ -28,7 +28,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
index a1f14f654..ecd14e2f8 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
@@ -24,7 +24,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_list.snap b/tests/snapshots/integration__integration_tests__help__help_config_list.snap
index 3b8b5b244..c376eaf4f 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_list.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_list.snap
@@ -24,7 +24,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_refresh_cache.snap b/tests/snapshots/integration__integration_tests__help__help_config_refresh_cache.snap
index 378277ece..2fa647e79 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_refresh_cache.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_refresh_cache.snap
@@ -24,7 +24,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_shell.snap b/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
index 9c1085327..9e038f6e6 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
@@ -28,7 +28,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_status_set.snap b/tests/snapshots/integration__integration_tests__help__help_config_status_set.snap
index f24cba97a..87a74b21f 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_status_set.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_status_set.snap
@@ -32,7 +32,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_status_unset.snap b/tests/snapshots/integration__integration_tests__help__help_config_status_unset.snap
index 2df6ab322..5790b3497 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_status_unset.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_status_unset.snap
@@ -31,7 +31,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_list.snap b/tests/snapshots/integration__integration_tests__help__help_list.snap
index d9b238035..e1097428c 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list.snap
@@ -42,7 +42,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_merge.snap b/tests/snapshots/integration__integration_tests__help__help_merge.snap
index da68a7f50..235209355 100644
--- a/tests/snapshots/integration__integration_tests__help__help_merge.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_merge.snap
@@ -52,7 +52,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove.snap b/tests/snapshots/integration__integration_tests__help__help_remove.snap
index d5061bbc3..c52667993 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove.snap
@@ -36,7 +36,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_root.snap b/tests/snapshots/integration__integration_tests__help__help_root.snap
index 2ee0a139b..11d00342a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_root.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_root.snap
@@ -33,7 +33,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__help__help_switch.snap b/tests/snapshots/integration__integration_tests__help__help_switch.snap
index ab8b799a9..67679a9d6 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch.snap
@@ -44,7 +44,7 @@ Options:
Global Options:
-C <path>
- Change working directory
+ Working directory for this command
--config <path>
User config file path
diff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snap
index 393c474df..7735470e4 100644
--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap
@@ -186,7 +186,7 @@ function __fish_wt_using_subcommand
contains -- $cmd[1] $argv
end
-complete -c wt -n "__fish_wt_needs_command" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_needs_command" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_needs_command" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_needs_command" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_needs_command" -s h -l help -d 'Print help (see more with \'--help\')'
@@ -198,7 +198,7 @@ complete -c wt -n "__fish_wt_needs_command" -f -a "list" -d 'List worktrees and
complete -c wt -n "__fish_wt_needs_command" -f -a "switch" -d 'Switch to a worktree'
complete -c wt -n "__fish_wt_needs_command" -f -a "remove" -d 'Remove worktree and branch'
complete -c wt -n "__fish_wt_needs_command" -f -a "merge" -d 'Merge worktree into target branch'
-complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from shell create list refresh-cache status approvals" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from shell create list refresh-cache status approvals" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from shell create list refresh-cache status approvals" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from shell create list refresh-cache status approvals" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from shell create list refresh-cache status approvals" -s h -l help -d 'Print help (see more with \'--help\')'
@@ -208,37 +208,37 @@ complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcom
complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from shell create list refresh-cache status approvals" -f -a "refresh-cache" -d 'Refresh default branch from remote'
complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from shell create list refresh-cache status approvals" -f -a "status" -d 'Manage branch status markers'
complete -c wt -n "__fish_wt_using_subcommand config; and not __fish_seen_subcommand_from shell create list refresh-cache status approvals" -f -a "approvals" -d 'Manage command approvals'
-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -s h -l help -d 'Print help'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -f -a "init" -d 'Generate shell integration code'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from shell" -f -a "install" -d 'Write shell integration to config files'
-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from create" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from create" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from create" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from create" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from create" -s h -l help -d 'Print help (see more with \'--help\')'
-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from list" -s h -l help -d 'Print help (see more with \'--help\')'
-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from refresh-cache" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from refresh-cache" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from refresh-cache" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from refresh-cache" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from refresh-cache" -s h -l help -d 'Print help (see more with \'--help\')'
-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from status" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from status" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from status" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from status" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from status" -s h -l help -d 'Print help'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from status" -f -a "set" -d 'Set status emoji for branch'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from status" -f -a "unset" -d 'Clear status emoji'
-complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from approvals" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from approvals" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from approvals" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from approvals" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from approvals" -s h -l help -d 'Print help (see more with \'--help\')'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from approvals" -f -a "ask" -d 'Store approvals in config'
complete -c wt -n "__fish_wt_using_subcommand config; and __fish_seen_subcommand_from approvals" -f -a "clear" -d 'Clear approved commands from config'
-complete -c wt -n "__fish_wt_using_subcommand step; and not __fish_seen_subcommand_from commit squash push rebase post-create post-start pre-commit pre-merge post-merge" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand step; and not __fish_seen_subcommand_from commit squash push rebase post-create post-start pre-commit pre-merge post-merge" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and not __fish_seen_subcommand_from commit squash push rebase post-create post-start pre-commit pre-merge post-merge" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and not __fish_seen_subcommand_from commit squash push rebase post-create post-start pre-commit pre-merge post-merge" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand step; and not __fish_seen_subcommand_from commit squash push rebase post-create post-start pre-commit pre-merge post-merge" -s h -l help -d 'Print help'
@@ -254,7 +254,7 @@ complete -c wt -n "__fish_wt_using_subcommand step; and not __fish_seen_subcomma
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from commit" -l stage -d 'What to stage before committing [default: all]' -r -f -a "all\t'Stage everything: untracked files + unstaged tracked changes'
tracked\t'Stage tracked changes only (like git add -u)'
none\t'Stage nothing, commit only what\'s already in the index'"
-complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from commit" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from commit" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from commit" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from commit" -s f -l force -d 'Skip approval prompts'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from commit" -l no-verify -d 'Skip pre-commit hooks'
@@ -263,58 +263,58 @@ complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_f
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from squash" -l stage -d 'What to stage before committing [default: all]' -r -f -a "all\t'Stage everything: untracked files + unstaged tracked changes'
tracked\t'Stage tracked changes only (like git add -u)'
none\t'Stage nothing, commit only what\'s already in the index'"
-complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from squash" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from squash" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from squash" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from squash" -s f -l force -d 'Skip approval prompts'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from squash" -l no-verify -d 'Skip pre-commit hooks'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from squash" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from squash" -s h -l help -d 'Print help (see more with \'--help\')'
-complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from push" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from push" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from push" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from push" -l allow-merge-commits -d 'Allow merge commits'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from push" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from push" -s h -l help -d 'Print help (see more with \'--help\')'
-complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from rebase" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from rebase" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from rebase" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from rebase" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from rebase" -s h -l help -d 'Print help (see more with \'--help\')'
-complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-create" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-create" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-create" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-create" -s f -l force -d 'Skip approval prompts'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-create" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-create" -s h -l help -d 'Print help'
-complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-start" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-start" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-start" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-start" -s f -l force -d 'Skip approval prompts'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-start" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-start" -s h -l help -d 'Print help'
-complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-commit" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-commit" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-commit" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-commit" -s f -l force -d 'Skip approval prompts'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-commit" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-commit" -s h -l help -d 'Print help'
-complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-merge" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-merge" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-merge" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-merge" -s f -l force -d 'Skip approval prompts'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-merge" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from pre-merge" -s h -l help -d 'Print help'
-complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-merge" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-merge" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-merge" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-merge" -s f -l force -d 'Skip approval prompts'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-merge" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand step; and __fish_seen_subcommand_from post-merge" -s h -l help -d 'Print help'
-complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from select" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from select" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from select" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from select" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from select" -s h -l help -d 'Print help'
complete -c wt -n "__fish_wt_using_subcommand beta; and not __fish_seen_subcommand_from select" -f -a "select" -d 'Interactive worktree selector'
-complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from select" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from select" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from select" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from select" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand beta; and __fish_seen_subcommand_from select" -s h -l help -d 'Print help (see more with \'--help\')'
complete -c wt -n "__fish_wt_using_subcommand list" -l format -d 'Output format (table, json)' -r -f -a "table\t'Human-readable table format'
json\t'JSON output'"
-complete -c wt -n "__fish_wt_using_subcommand list" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand list" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand list" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand list" -l branches -d 'Include branches without worktrees'
complete -c wt -n "__fish_wt_using_subcommand list" -l remotes -d 'Include remote branches'
@@ -325,14 +325,14 @@ complete -c wt -n "__fish_wt_using_subcommand list" -s v -l verbose -d 'Show com
complete -c wt -n "__fish_wt_using_subcommand list" -s h -l help -d 'Print help (see more with \'--help\')'
complete -c wt -n "__fish_wt_using_subcommand switch" -s b -l base -f -d 'Base branch' -r
complete -c wt -n "__fish_wt_using_subcommand switch" -s x -l execute -d 'Command to run after switch' -r
-complete -c wt -n "__fish_wt_using_subcommand switch" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand switch" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand switch" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand switch" -s c -l create -d 'Create a new branch'
complete -c wt -n "__fish_wt_using_subcommand switch" -s f -l force -d 'Skip approval prompts'
complete -c wt -n "__fish_wt_using_subcommand switch" -l no-verify -d 'Skip all project hooks'
complete -c wt -n "__fish_wt_using_subcommand switch" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand switch" -s h -l help -d 'Print help (see more with \'--help\')'
-complete -c wt -n "__fish_wt_using_subcommand remove" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand remove" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand remove" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand remove" -l no-delete-branch -d 'Keep branch after removal'
complete -c wt -n "__fish_wt_using_subcommand remove" -s D -l force-delete -d 'Delete unmerged branches'
@@ -342,7 +342,7 @@ complete -c wt -n "__fish_wt_using_subcommand remove" -s h -l help -d 'Print hel
complete -c wt -n "__fish_wt_using_subcommand merge" -l stage -d 'What to stage before committing [default: all]' -r -f -a "all\t'Stage everything: untracked files + unstaged tracked changes'
tracked\t'Stage tracked changes only (like git add -u)'
none\t'Stage nothing, commit only what\'s already in the index'"
-complete -c wt -n "__fish_wt_using_subcommand merge" -s C -d 'Change working directory' -r -F
+complete -c wt -n "__fish_wt_using_subcommand merge" -s C -d 'Working directory for this command' -r -F
complete -c wt -n "__fish_wt_using_subcommand merge" -l config -d 'User config file path' -r -F
complete -c wt -n "__fish_wt_using_subcommand merge" -l squash -d 'Force commit squashing'
complete -c wt -n "__fish_wt_using_subcommand merge" -l no-squash -d 'Skip commit squashing'
diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
index aa3d98416..03e035d54 100644
--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
@@ -183,7 +183,7 @@ _wt() {
local context curcontext="$curcontext" state line
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -202,7 +202,7 @@ _wt() {
case $line[1] in
(config)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -220,7 +220,7 @@ _arguments "${_arguments_options[@]}" : \
case $line[1] in
(shell)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -239,7 +239,7 @@ _arguments "${_arguments_options[@]}" : \
(init)
_arguments "${_arguments_options[@]}" : \
'--command-name=[Command name]:COMMAND_NAME:_default' \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -251,7 +251,7 @@ _arguments "${_arguments_options[@]}" : \
(install)
_arguments "${_arguments_options[@]}" : \
'--command-name=[Command name]:COMMAND_NAME:_default' \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-f[Skip confirmation prompt]' \
'--force[Skip confirmation prompt]' \
@@ -268,7 +268,7 @@ esac
;;
(create)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -278,7 +278,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(list)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -288,7 +288,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(refresh-cache)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -298,7 +298,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(status)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -317,7 +317,7 @@ _arguments "${_arguments_options[@]}" : \
(set)
_arguments "${_arguments_options[@]}" : \
'--branch=[Target branch (defaults to current)]:BRANCH:_default' \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -328,7 +328,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(unset)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -343,7 +343,7 @@ esac
;;
(approvals)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -361,7 +361,7 @@ _arguments "${_arguments_options[@]}" : \
case $line[1] in
(ask)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-f[Skip approval prompts]' \
'--force[Skip approval prompts]' \
@@ -374,7 +374,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(clear)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-g[Clear global approvals]' \
'--global[Clear global approvals]' \
@@ -394,7 +394,7 @@ esac
;;
(step)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -415,7 +415,7 @@ _arguments "${_arguments_options[@]}" : \
'--stage=[What to stage before committing \[default\: all\]]:STAGE:((all\:"Stage everything\: untracked files + unstaged tracked changes"
tracked\:"Stage tracked changes only (like git add -u)"
none\:"Stage nothing, commit only what'\''s already in the index"))' \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-f[Skip approval prompts]' \
'--force[Skip approval prompts]' \
@@ -431,7 +431,7 @@ _arguments "${_arguments_options[@]}" : \
'--stage=[What to stage before committing \[default\: all\]]:STAGE:((all\:"Stage everything\: untracked files + unstaged tracked changes"
tracked\:"Stage tracked changes only (like git add -u)"
none\:"Stage nothing, commit only what'\''s already in the index"))' \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-f[Skip approval prompts]' \
'--force[Skip approval prompts]' \
@@ -445,7 +445,7 @@ none\:"Stage nothing, commit only what'\''s already in the index"))' \
;;
(push)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'--allow-merge-commits[Allow merge commits]' \
'-v[Show commands and debug info]' \
@@ -457,7 +457,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(rebase)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -468,7 +468,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(post-create)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-f[Skip approval prompts]' \
'--force[Skip approval prompts]' \
@@ -480,7 +480,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(post-start)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-f[Skip approval prompts]' \
'--force[Skip approval prompts]' \
@@ -492,7 +492,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(pre-commit)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-f[Skip approval prompts]' \
'--force[Skip approval prompts]' \
@@ -504,7 +504,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(pre-merge)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-f[Skip approval prompts]' \
'--force[Skip approval prompts]' \
@@ -516,7 +516,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(post-merge)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-f[Skip approval prompts]' \
'--force[Skip approval prompts]' \
@@ -532,7 +532,7 @@ esac
;;
(beta)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -550,7 +550,7 @@ _arguments "${_arguments_options[@]}" : \
case $line[1] in
(select)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
@@ -566,7 +566,7 @@ esac
_arguments "${_arguments_options[@]}" : \
'--format=[Output format (table, json)]:FORMAT:((table\:"Human-readable table format"
json\:"JSON output"))' \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'--branches[Include branches without worktrees]' \
'--remotes[Include remote branches]' \
@@ -585,7 +585,7 @@ _arguments "${_arguments_options[@]}" : \
'--base=[Base branch]:BASE:_default' \
'-x+[Command to run after switch]:EXECUTE:_default' \
'--execute=[Command to run after switch]:EXECUTE:_default' \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'-c[Create a new branch]' \
'--create[Create a new branch]' \
@@ -601,7 +601,7 @@ _arguments "${_arguments_options[@]}" : \
;;
(remove)
_arguments "${_arguments_options[@]}" : \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'--no-delete-branch[Keep branch after removal]' \
'-D[Delete unmerged branches]' \
@@ -619,7 +619,7 @@ _arguments "${_arguments_options[@]}" : \
'--stage=[What to stage before committing \[default\: all\]]:STAGE:((all\:"Stage everything\: untracked files + unstaged tracked changes"
tracked\:"Stage tracked changes only (like git add -u)"
none\:"Stage nothing, commit only what'\''s already in the index"))' \
-'-C+[Change working directory]:path:_files' \
+'-C+[Working directory for this command]:path:_files' \
'--config=[User config file path]:path:_files' \
'--squash[Force commit squashing]' \
'--no-squash[Skip commit squashing]' \