Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Reorder status symbols in README
Maximilian Roosbd5d6ae95d5f
diff --git a/README.md b/README.mdindex f2848f913..d67bc5d16 100644--- a/README.md+++ b/README.md@@ -713,13 +713,11 @@ Options:## Status Symbols-Order: `?!+»✘ ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`+Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`-- `?` Untracked files present-- `!` Modified files (unstaged changes)- `+` Staged files (ready to commit)-- `»` Renamed files-- `✘` Deleted files+- `!` Modified files (unstaged changes)+- `?` Untracked files present- `✖` **Merge conflicts** - unresolved conflicts in working tree (fix before continuing)- `⚠` **Would conflict** - merging into main would fail- `≡` Working tree matches main (identical contents, regardless of commit history)diff --git a/src/cli.rs b/src/cli.rsindex bc7b78e4c..8c2f4c3e4 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -616,13 +616,11 @@ Docs: <https://llm.datasette.io/> | <https://github.com/sigoden/aichat>## Status Symbols-Order: `?!+»✘ ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`+Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`-- `?` Untracked files present-- `!` Modified files (unstaged changes)- `+` Staged files (ready to commit)-- `»` Renamed files-- `✘` Deleted files+- `!` Modified files (unstaged changes)+- `?` Untracked files present- `✖` **Merge conflicts** - unresolved conflicts in working tree (fix before continuing)- `⚠` **Would conflict** - merging into main would fail- `≡` Working tree matches main (identical contents, regardless of commit history)diff --git a/tests/snapshots/integration__integration_tests__help__help_list.snap b/tests/snapshots/integration__integration_tests__help__help_list.snapindex 4aa8dc995..379df46f2 100644--- a/tests/snapshots/integration__integration_tests__help__help_list.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list.snap@@ -76,13 +76,11 @@ Global Options:[32mStatus Symbols[0m-Order: [2m?!+»✘ ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠[0m+Order: [2m+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠[0m-- [2m?[0m Untracked files present-- [2m![0m Modified files (unstaged changes)- [2m+[0m Staged files (ready to commit)-- [2m»[0m Renamed files-- [2m✘[0m Deleted files+- [2m![0m Modified files (unstaged changes)+- [2m?[0m Untracked files present- [2m✖[0m [1mMerge conflicts[0m - unresolved conflicts in working tree (fix before continuing)- [2m⚠[0m [1mWould conflict[0m - merging into main would fail- [2m≡[0m Working tree matches main (identical contents, regardless of commit history)