Skip to content

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

Clarify working tree status symbols as subcolumns

Maximilian Roosac3e27d5b984
diff --git a/docs/content/list.md b/docs/content/list.md
index 756709d58..866fa0f43 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -103,11 +103,11 @@ CI is only checked for branches that track a remote — local-only branches show
Symbols appear in the Status column in this order:
-| Category | Symbol | Meaning |
-|----------|--------|---------|
-| Working tree | `+` | Staged files |
-| | `!` | Modified files (unstaged) |
-| | `?` | Untracked files |
+| Subcolumn | Symbol | Meaning |
+|-----------|--------|---------|
+| Working tree (1) | `+` | Staged files |
+| Working tree (2) | `!` | Modified files (unstaged) |
+| Working tree (3) | `?` | Untracked files |
| Branch state | `✖` | Merge conflicts |
| | `↻` | Rebase in progress |
| | `⋈` | Merge in progress |
diff --git a/src/cli.rs b/src/cli.rs
index 261e1f10a..479b9c2fa 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1414,11 +1414,11 @@ CI is only checked for branches that track a remote — local-only branches show
Symbols appear in the Status column in this order:
-| Category | Symbol | Meaning |
-|----------|--------|---------|
-| Working tree | `+` | Staged files |
-| | `!` | Modified files (unstaged) |
-| | `?` | Untracked files |
+| Subcolumn | Symbol | Meaning |
+|-----------|--------|---------|
+| Working tree (1) | `+` | Staged files |
+| Working tree (2) | `!` | Modified files (unstaged) |
+| Working tree (3) | `?` | Untracked files |
| Branch state | `✖` | Merge conflicts |
| | `↻` | Rebase in progress |
| | `⋈` | Merge in progress |
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index e6b5f6431..7afc72106 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -112,11 +112,11 @@ CI is only checked for branches that track a remote — local-only branches show
Symbols appear in the Status column in this order:
- Category Symbol Meaning
+ Subcolumn Symbol Meaning
───────────────── ────── ────────────────────────────────────
- Working tree + Staged files
- ! Modified files (unstaged)
- ? Untracked files
+ Working tree (1) + Staged files
+ Working tree (2) ! Modified files (unstaged)
+ Working tree (3) ? Untracked files
Branch state ✖ Merge conflicts
↻ Rebase in progress
⋈ Merge in progress