Skip to content

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

docs: Clarify squash command description

Maximilian Roosddd4cbf0f6c5
diff --git a/docs/content/step.md b/docs/content/step.md
index c20f0a6c9..a2fd0fde5 100644
--- a/docs/content/step.md
+++ b/docs/content/step.md
@@ -50,7 +50,7 @@ Usage: <b><span class=c>wt step</span></b> <span class=c>[OPTIONS]</span> <span
<b><span class=g>Commands:</span></b>
<b><span class=c>commit</span></b> Commit changes with LLM commit message
- <b><span class=c>squash</span></b> Squash commits down to target
+ <b><span class=c>squash</span></b> Squash commits since target
<b><span class=c>push</span></b> Push changes to local target branch
<b><span class=c>rebase</span></b> Rebase onto target
<b><span class=c>for-each</span></b> [experimental] Run command in each worktree
diff --git a/src/cli.rs b/src/cli.rs
index 20a3e55e4..6b0f708b4 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -888,9 +888,9 @@ pub enum StepCommand {
show_prompt: bool,
},
- /// Squash commits down to target
+ /// Squash commits since target
///
- /// Stages working tree changes, combines all commits since the target into a single commit, generates message with LLM.
+ /// Stages working tree changes, squashes all commits since diverging from target into one, generates message with LLM.
Squash {
/// Target branch
///
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_long.snap b/tests/snapshots/integration__integration_tests__help__help_step_long.snap
index 231a6bb81..d56e92ebf 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_long.snap
@@ -24,7 +24,7 @@ Usage: wt step [OPTIONS] <COMMAND>
Commands:
commit Commit changes with LLM commit message
- squash Squash commits down to target
+ squash Squash commits since target
push Push changes to local target branch
rebase Rebase onto target
for-each [experimental] Run command in each worktree
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_short.snap b/tests/snapshots/integration__integration_tests__help__help_step_short.snap
index 940bbdd2d..a5f57dfff 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_short.snap
@@ -23,7 +23,7 @@ Usage: wt step [OPTIONS] <COMMAND>
Commands:
commit Commit changes with LLM commit message
- squash Squash commits down to target
+ squash Squash commits since target
push Push changes to local target branch
rebase Rebase onto target
for-each [experimental] Run command in each worktree