Skip to content

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

Clarify worktree path computation as configurable

Maximilian Roos3719a9de4dea
diff --git a/README.md b/README.md
index dda205530..07f33b843 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,7 @@ worktree requires typing the branch name three times: `git worktree add -b feat
## Worktrunk makes git worktrees as easy as branches
-Each worktree has exactly one branch, so Worktrunk uses branch names to address
-worktrees. The path is derived automatically.
+Worktrees are addressed by branch name; paths are computed from a configurable template.
> Start with the core commands
diff --git a/docs/content/switch.md b/docs/content/switch.md
index 0e1fdbe96..9811a073a 100644
--- a/docs/content/switch.md
+++ b/docs/content/switch.md
@@ -17,7 +17,7 @@ Change directory to a worktree, creating one if needed.
</picture>
</figure>
-Worktrees are addressed by branch name; paths are computed from a template. Unlike `git switch`, this navigates between worktrees rather than changing branches in place.
+Worktrees are addressed by branch name; paths are computed from a configurable template. Unlike `git switch`, this navigates between worktrees rather than changing branches in place.
## Examples
diff --git a/docs/content/worktrunk.md b/docs/content/worktrunk.md
index 882b5980e..9302e2fce 100644
--- a/docs/content/worktrunk.md
+++ b/docs/content/worktrunk.md
@@ -33,8 +33,7 @@ worktree requires typing the branch name three times: `git worktree add -b feat
## Worktrunk makes git worktrees as easy as branches
-Each worktree has exactly one branch, so Worktrunk uses branch names to address
-worktrees. The path is derived automatically.
+Worktrees are addressed by branch name; paths are computed from a configurable template.
> Start with the core commands
diff --git a/src/cli.rs b/src/cli.rs
index 5be5a8df3..57bb39076 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -141,7 +141,7 @@ pub enum OutputFormat {
Getting started
wt switch --create feature Create worktree and branch
- wt switch feature Switch to existing worktree
+ wt switch feature Switch to worktree
wt list Show all worktrees
wt merge Squash, rebase, and merge to default branch
@@ -1255,7 +1255,7 @@ pub enum Commands {
after_long_help = r#"Change directory to a worktree, creating one if needed.
<!-- demo: wt-switch.gif 1600x900 -->
-Worktrees are addressed by branch name; paths are computed from a template. Unlike `git switch`, this navigates between worktrees rather than changing branches in place.
+Worktrees are addressed by branch name; paths are computed from a configurable template. Unlike `git switch`, this navigates between worktrees rather than changing branches in place.
## Examples
diff --git a/tests/snapshots/integration__integration_tests__help__help_md_root.snap b/tests/snapshots/integration__integration_tests__help__help_md_root.snap
index dc97deb5d..4d2dfc53d 100644
--- a/tests/snapshots/integration__integration_tests__help__help_md_root.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_md_root.snap
@@ -51,7 +51,7 @@ Global Options:
Getting started
wt switch --create feature Create worktree and branch
- wt switch feature Switch to existing worktree
+ wt switch feature Switch to worktree
wt list Show all worktrees
wt merge Squash, rebase, and merge to default branch
diff --git a/tests/snapshots/integration__integration_tests__help__help_page_switch.snap b/tests/snapshots/integration__integration_tests__help__help_page_switch.snap
index 98070f872..2bf5894d1 100644
--- a/tests/snapshots/integration__integration_tests__help__help_page_switch.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_page_switch.snap
@@ -11,6 +11,7 @@ info:
GIT_EDITOR: ""
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
---
@@ -28,7 +29,7 @@ Change directory to a worktree, creating one if needed.
</picture>
</figure>
-Worktrees are addressed by branch name; paths are computed from a template. Unlike `git switch`, this navigates between worktrees rather than changing branches in place.
+Worktrees are addressed by branch name; paths are computed from a configurable template. Unlike `git switch`, this navigates between worktrees rather than changing branches in place.
## Examples
diff --git a/tests/snapshots/integration__integration_tests__help__help_root_long.snap b/tests/snapshots/integration__integration_tests__help__help_root_long.snap
index 669894b09..c7da7026e 100644
--- a/tests/snapshots/integration__integration_tests__help__help_root_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_root_long.snap
@@ -53,7 +53,7 @@ Usage: wt [OPTIONS] [COMMAND]
Getting started
wt switch --create feature Create worktree and branch
- wt switch feature Switch to existing worktree
+ wt switch feature Switch to worktree
wt list Show all worktrees
wt merge Squash, rebase, and merge to default branch
diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
index 327fdd1c6..6acd855d1 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
@@ -82,8 +82,8 @@ Usage: wt switch [OPTIONS] <BRANCH> [--
Change directory to a worktree, creating one if needed.
-Worktrees are addressed by branch name; paths are computed from a template. Unlike git switch, this navigates between worktrees rather than changing
-branches in place.
+Worktrees are addressed by branch name; paths are computed from a configurable template. Unlike git switch, this navigates between worktrees rather
+than changing branches in place.
Examples