Skip to content

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

Reorder divergence symbols by priority in status documentation

Maximilian Roos8bb22a4ee3bc
diff --git a/docs/content/list.md b/docs/content/list.md
index 4eaecbc52..e4d069c82 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -115,13 +115,13 @@ The Status column has multiple subcolumns. Within each, only the first matching
| | `·` | Same commit |
| | `⊂` | Content integrated (`--full` detects additional cases) |
| Main divergence | `^` | Is the main branch |
+| | `↕` | Diverged from main |
| | `↑` | Ahead of main |
| | `↓` | Behind main |
-| | `↕` | Diverged from main |
| Remote divergence | `\|` | In sync with remote |
+| | `⇅` | Diverged from remote |
| | `⇡` | Ahead of remote |
| | `⇣` | Behind remote |
-| | `⇅` | Diverged from remote |
| Worktree state | `/` | Branch without worktree |
| | `⚑` | Path doesn't match template |
| | `⌫` | Prunable (directory missing) |
diff --git a/src/cli.rs b/src/cli.rs
index 20ce628bd..7a2bf96b3 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1388,13 +1388,13 @@ The Status column has multiple subcolumns. Within each, only the first matching
| | `·` | Same commit |
| | `⊂` | Content integrated (`--full` detects additional cases) |
| Main divergence | `^` | Is the main branch |
+| | `↕` | Diverged from main |
| | `↑` | Ahead of main |
| | `↓` | Behind main |
-| | `↕` | Diverged from main |
| Remote divergence | `\|` | In sync with remote |
+| | `⇅` | Diverged from remote |
| | `⇡` | Ahead of remote |
| | `⇣` | Behind remote |
-| | `⇅` | Diverged from remote |
| Worktree state | `/` | Branch without worktree |
| | `⚑` | Path doesn't match template |
| | `⌫` | Prunable (directory missing) |
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 90379ea1d..9ccff8acd 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -1033,8 +1033,8 @@ impl PositionMask {
/// Symbols are categorized to enable vertical alignment in table output:
/// - Working tree: +, !, ? (staged, modified, untracked - priority order)
/// - Branch/op state: ✖, ↻, ⋈, ⚔, ·, ⊂ (combined position with priority)
-/// - Main divergence: ^, ↑, ↓, ↕
-/// - Upstream divergence: ⇡, ⇣, ⇅
+/// - Main divergence: ^, ↕, ↑, ↓
+/// - Upstream divergence: ⇅, ⇡, ⇣
/// - Worktree state: / for branches, ⚑⌫⊠ for worktrees (priority-only)
/// - User marker: custom labels, emoji
///
@@ -1050,8 +1050,8 @@ impl PositionMask {
/// - ⊂: Content integrated (removable)
///
/// **Mutually exclusive (enforced by type system):**
-/// - ^ vs ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)
-/// - ⇡ vs ⇣ vs ⇅: Upstream divergence (UpstreamDivergence enum)
+/// - ^ vs ↕ vs ↑ vs ↓: Main divergence (MainDivergence enum)
+/// - ⇅ vs ⇡ vs ⇣: Upstream divergence (UpstreamDivergence enum)
///
/// **Priority-only (can co-occur but only highest priority shown):**
/// - ⚑ vs ⌫ vs ⊠: Worktree attrs (priority: path_mismatch ⚑ > prunable ⌫ > locked ⊠)
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 f202ec54d..52aee776a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -124,13 +124,13 @@ The Status column has multiple subcolumns. Within each, only the first matching
· Same commit
⊂ Content integrated (--full detects additional cases)
Main divergence ^ Is the main branch
+ ↕ Diverged from main
↑ Ahead of main
↓ Behind main
- ↕ Diverged from main
Remote divergence | In sync with remote
+ ⇅ Diverged from remote
⇡ Ahead of remote
⇣ Behind remote
- ⇅ Diverged from remote
Worktree state / Branch without worktree
⚑ Path doesn't match template
⌫ Prunable (directory missing)