Skip to content

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

feat: Document status symbols for `wt list`

Maximilian Roos2f36bc3e3d36
diff --git a/README.md b/README.md
index 8f5f58f24..78c02f520 100644
--- a/README.md
+++ b/README.md
@@ -128,6 +128,31 @@ Both dimming conditions use OR logic: either is sufficient to dim. "no commits"
</details>
+<details>
+<summary>Status column symbols in <code>wt list</code></summary>
+
+The Status column shows git repository state using compact symbols. Symbol order indicates priority: conflicts (blocking) → branch divergence → working tree changes.
+
+| Symbol | Meaning | Category |
+|--------|---------|----------|
+| `·` | Branch without worktree | N/A |
+| `=` | Conflicts with main | Blocking |
+| `↑` | Commits ahead of main | Branch divergence |
+| `↓` | Commits behind main | Branch divergence |
+| `⇡` | Commits ahead of remote | Remote divergence |
+| `⇣` | Commits behind remote | Remote divergence |
+| `?` | Untracked files | Working tree |
+| `!` | Modified files (unstaged) | Working tree |
+| `+` | Staged files | Working tree |
+| `»` | Renamed files | Working tree |
+| `✘` | Deleted files | Working tree |
+
+Symbols combine to show complete state (e.g., `↑↓!` means ahead of main, behind main, and has unstaged changes).
+
+**Branch-only entries:** Branches without worktrees show `·` in the Status column, indicating git status is not applicable (no working directory to check).
+
+</details>
+
## Configuration
```bash
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 654cc50fd..722831ba1 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -318,7 +318,7 @@ impl BranchInfo {
struct GitStatusInfo {
/// Whether the working tree has any changes (staged or unstaged)
is_dirty: bool,
- /// Status symbols: = (conflicts), ↑ (ahead of main), ↓ (behind main), ⇡ (ahead of remote), ⇣ (behind remote), ? (untracked), ! (modified), + (staged), » (renamed), ✘ (deleted)
+ /// Status symbols: · (branch only, no worktree), = (conflicts), ↑ (ahead of main), ↓ (behind main), ⇡ (ahead of remote), ⇣ (behind remote), ? (untracked), ! (modified), + (staged), » (renamed), ✘ (deleted)
symbols: String,
}
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index a0ea9784f..36ebdfbd0 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -356,17 +356,21 @@ pub fn format_list_item_line(
}
}
(ColumnKind::Status, _) => {
- if let Some(info) = worktree_info {
- let status_text = if is_last {
- info.status_symbols.clone()
- } else {
- format!("{:width$}", info.status_symbols, width = column.width)
- };
- // Status column never inherits row color
- line.push_raw(status_text);
- } else if !is_last {
- push_blank(&mut line, column.width);
- }
+ // Determine status content: actual symbols or middle dot indicator for branch-only entries
+ let status_content = if let Some(info) = worktree_info {
+ info.status_symbols.clone()
+ } else {
+ "·".to_string()
+ };
+
+ let status_text = if is_last {
+ status_content
+ } else {
+ format!("{:width$}", status_content, width = column.width)
+ };
+
+ // Status column never inherits row color
+ line.push_raw(status_text);
}
(ColumnKind::WorkingDiff, ColumnFormat::Diff { digits, variant }) => {
if let Some(info) = worktree_info {
diff --git a/src/main.rs b/src/main.rs
index 676b5b987..5a1dc51e3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -184,6 +184,7 @@ COLUMNS:
Message: Last commit message (truncated)
STATUS SYMBOLS:
+ · Branch without worktree (no working directory to check)
= Merge conflicts (unmerged paths in working tree)
↑ Ahead of main branch
↓ Behind main branch