Skip to content

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

Replace branch-without-worktree symbol from ⎇ to /

Maximilian Roosc3eaebde255c
diff --git a/docs/content/list.md b/docs/content/list.md
index bb379073e..c0be7a896 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -56,8 +56,8 @@ Include branches that don't have worktrees:
@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>28d38c20</span> <span class=d>30m</span>
^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>2e6b7a8f</span> <span class=d>4d</span>
+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>1d697d5b</span> <span class=d>5h</span>
- exp <span class=d>↕</span> <span class=d>⎇</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>32936618</span> <span class=d>2d</span>
- wip <span class=d>↕</span> <span class=d>⎇</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>6844b101</span> <span class=d>3d</span>
+ exp <span class=d>↕</span> <span class=d>/</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>32936618</span> <span class=d>2d</span>
+ wip <span class=d>↕</span> <span class=d>/</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>6844b101</span> <span class=d>3d</span>
⚪ <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
{% end %}
@@ -120,7 +120,7 @@ Symbols appear in the Status column in this order:
| Remote | `⇡` | Ahead of remote |
| | `⇣` | Behind remote |
| | `⇅` | Diverged from remote |
-| Other | `⎇` | Branch without worktree |
+| Other | `/` | Branch without worktree |
| | `⌫` | Prunable (directory missing) |
| | `⊠` | Locked worktree |
diff --git a/src/cli.rs b/src/cli.rs
index 9c3572ce5..a1b4a5ec4 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -926,7 +926,7 @@ Symbols appear in the Status column in this order:
| Remote | `⇡` | Ahead of remote |
| | `⇣` | Behind remote |
| | `⇅` | Diverged from remote |
-| Other | `⎇` | Branch without worktree |
+| Other | `/` | Branch without worktree |
| | `⌫` | Prunable (directory missing) |
| | `⊠` | Locked worktree |
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 2e3db9ae8..5a71167be 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -719,7 +719,7 @@ impl UpstreamDivergence {
///
/// Shows the "location" state of a worktree or branch:
/// - For worktrees: whether the path matches the template, or has issues
-/// - For branches (without worktree): shows ⎇ to distinguish from worktrees
+/// - For branches (without worktree): shows / to distinguish from worktrees
///
/// Priority order for worktrees: PathMismatch > Prunable > Locked
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, strum::IntoStaticStr)]
@@ -745,7 +745,7 @@ impl std::fmt::Display for WorktreeState {
Self::PathMismatch => write!(f, "⚑"),
Self::Prunable => write!(f, "⌫"),
Self::Locked => write!(f, "⊠"),
- Self::Branch => write!(f, "⎇"),
+ Self::Branch => write!(f, "/"),
}
}
}
@@ -887,7 +887,7 @@ impl PositionMask {
1, // BRANCH_OP_STATE: ✖↻⋈⚠≡_ (1 char, priority: conflicts > rebase > merge > merge-tree > no-commits > matches)
1, // MAIN_DIVERGENCE: ^, ↑, ↓, ↕ (1 char)
1, // UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)
- 1, // WORKTREE_STATE: ⎇ for branches, ⚑⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)
+ 1, // WORKTREE_STATE: / for branches, ⚑⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)
2, // USER_MARKER: single emoji or two chars (allocate 2)
],
};
@@ -905,7 +905,7 @@ impl PositionMask {
/// - Branch/op state: ✖, ↻, ⋈, ⚠, ≡, _ (combined position with priority)
/// - Main divergence: ^, ↑, ↓, ↕
/// - Upstream divergence: ⇡, ⇣, ⇅
-/// - Worktree state: ⎇ for branches, ⚑⌫⊠ for worktrees (priority-only)
+/// - Worktree state: / for branches, ⚑⌫⊠ for worktrees (priority-only)
/// - User marker: custom labels, emoji
///
/// ## Mutual Exclusivity
@@ -925,7 +925,7 @@ impl PositionMask {
///
/// **Priority-only (can co-occur but only highest priority shown):**
/// - ⚑ vs ⌫ vs ⊠: Worktree attrs (priority: path_mismatch ⚑ > prunable ⌫ > locked ⊠)
-/// - ⎇: Branch indicator (mutually exclusive with ⚑⌫⊠ as branches can't have worktree attrs)
+/// - /: Branch indicator (mutually exclusive with ⚑⌫⊠ as branches can't have worktree attrs)
///
/// **NOT mutually exclusive (can co-occur):**
/// - Working tree symbols (+!?): Can have multiple types of changes
@@ -935,7 +935,7 @@ pub struct StatusSymbols {
/// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⊘) > MatchesMain (≡) > NoCommits (∅)
pub(crate) branch_op_state: BranchOpState,
- /// Worktree state: ⎇ for branches, ⚑⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)
+ /// Worktree state: / for branches, ⚑⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)
pub(crate) worktree_state: WorktreeState,
/// Main branch divergence state (mutually exclusive)
@@ -1052,7 +1052,7 @@ impl StatusSymbols {
let worktree_state_str = match self.worktree_state {
WorktreeState::None => String::new(),
- // Branch indicator (⎇) is informational (dimmed)
+ // Branch indicator (/) is informational (dimmed)
WorktreeState::Branch => cformat!("<dim>{}</>", self.worktree_state),
// Path mismatch (⚑) is a stronger warning (red)
WorktreeState::PathMismatch => cformat!("<red>{}</>", self.worktree_state),
diff --git a/src/completion.rs b/src/completion.rs
index 1539ec815..76d55826f 100644
--- a/src/completion.rs
+++ b/src/completion.rs
@@ -87,7 +87,7 @@ fn complete_branches(suppress_with_create: bool) -> Vec<CompletionCandidate> {
let time_str = format_relative_time_short(branch.timestamp);
let help = match branch.category {
BranchCategory::Worktree => format!("+ {}", time_str),
- BranchCategory::Local => format!("⎇ {}", time_str),
+ BranchCategory::Local => format!("/ {}", time_str),
BranchCategory::Remote(remote) => format!("⇣ {} {}", time_str, remote),
};
CompletionCandidate::new(branch.name).help(Some(help.into()))
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
index edd9beee4..d8b66af7a 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
@@ -6,7 +6,7 @@ expression: normalized
Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
> @ main ^ ./repo │
+ active-worktree _ ./repo..│⚪ main has no uncommitted changes
- orphan-branch _ ⎇ │
+ orphan-branch _ / │
│
│
│
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 7cffd91f6..2c27f0f23 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -129,7 +129,7 @@ Symbols appear in the Status column in this order:
| Remote | ⇡ | Ahead of remote |
| | ⇣ | Behind remote |
| | ⇅ | Diverged from remote |
-| Other | ⎇ | Branch without worktree |
+| Other | / | Branch without worktree |
| | ⌫ | Prunable (directory missing) |
| | ⊠ | Locked worktree |
diff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
index df16370e2..c07b78759 100644
--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . b834638e 1d Initial commit
- branch-only _ ⎇ b834638e 1d Initial commit
+ branch-only _ / b834638e 1d Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
index 93cfbad0b..358d0542a 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -27,7 +27,7 @@ exit_code: 0
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
- orphan-1 _ ⎇ b834638e 1d Initial commit
- orphan-2 _ ⎇ b834638e 1d Initial commit
+ orphan-1 _ / b834638e 1d Initial commit
+ orphan-2 _ / b834638e 1d Initial commit
⚪ Showing 2 worktrees, 2 branches
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
index 6d272a1a1..bb6880ab6 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
@@ -28,7 +28,7 @@ exit_code: 0
@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● 28d38c20 30m
^ main ^⇅ ./repo ⇡1 ⇣1 ● 2e6b7a8f 4d
+ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 1d697d5b 5h
- exp ↕ ⎇ ↑2 ↓1 +137 32936618 2d
- wip ↕ ⎇ ↑1 ↓1 +33 6844b101 3d
+ exp ↕ / ↑2 ↓1 +137 32936618 2d
+ wip ↕ / ↑1 ↓1 +33 6844b101 3d
⚪ Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index 01d87f4aa..c0f38dd18 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -26,8 +26,8 @@ exit_code: 0
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
- another-branch _ ⎇ b834638e 1d Initial commit
- feature-without-worktree _ ⎇ b834638e 1d Initial commit
- fix-bug _ ⎇ b834638e 1d Initial commit
+ another-branch _ / b834638e 1d Initial commit
+ feature-without-worktree _ / b834638e 1d Initial commit
+ fix-bug _ / b834638e 1d Initial commit
⚪ Showing 2 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
index 55995e66b..1e5531c11 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . b834638e 1d Initial commit
- branch-alpha _ ⎇ b834638e 1d Initial commit
- branch-beta _ ⎇ b834638e 1d Initial commit
- branch-gamma _ ⎇ b834638e 1d Initial commit
+ branch-alpha _ / b834638e 1d Initial commit
+ branch-beta _ / b834638e 1d Initial commit
+ branch-gamma _ / b834638e 1d Initial commit
⚪ Showing 1 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
index d43e9bbe1..8b3e591b5 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^| . | b834638e 1d Initial commit
- local-only-1 _ ⎇ b834638e 1d Initial commit
- local-only-2 _ ⎇ b834638e 1d Initial commit
- origin/remote-only-1 _ ⎇ b834638e 1d Initial commit
- origin/remote-only-2 _ ⎇ b834638e 1d Initial commit
+ local-only-1 _ / b834638e 1d Initial commit
+ local-only-2 _ / b834638e 1d Initial commit
+ origin/remote-only-1 _ / b834638e 1d Initial commit
+ origin/remote-only-2 _ / b834638e 1d Initial commit
⚪ Showing 1 worktrees, 2 branches, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index 98d92c3cb..04ff29d92 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
@@ -26,6 +26,6 @@ exit_code: 0
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^| ./repo | b834638e 1d Initial commit
+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
- origin/remote-only _ ⎇ b834638e 1d Initial commit
+ origin/remote-only _ / b834638e 1d Initial commit
⚪ Showing 2 worktrees, 1 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
index 5c35b5eea..a82ad0feb 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^| . | b834638e 1d Initial commit
- origin/remote-feature-1 _ ⎇ b834638e 1d Initial commit
- origin/remote-feature-2 _ ⎇ b834638e 1d Initial commit
+ origin/remote-feature-1 _ / b834638e 1d Initial commit
+ origin/remote-feature-2 _ / b834638e 1d Initial commit
⚪ Showing 1 worktrees, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
index bf5a5923d..7f335a7d6 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
@@ -27,6 +27,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . b834638e 1d Initial commit
- feature _ ⎇ b834638e 1d Initial commit
+ feature _ / b834638e 1d Initial commit
⚪ Showing 1 worktrees, 1 branches