Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Clarify config documentation for command flags
Maximilian Rooscc3f201792db
diff --git a/docs/content/config.md b/docs/content/config.mdindex 2fc892550..f6e80d106 100644--- a/docs/content/config.md+++ b/docs/content/config.md@@ -65,17 +65,18 @@ worktree-path = ".worktrees/{{ branch }}"worktree-path = "../worktrees/{{ main_worktree }}/{{ branch }}"```-### Command defaults+### Command settings-Override default flag behavior for commands. Settings here apply unless explicitly overridden on the command line.+Set persistent flag values for commands. These apply unless explicitly overridden on the command line.-**`wt list` defaults:**+**`wt list`:**```toml[list]-full = true # --full (default: false)-branches = true # --branches (default: false)-remotes = true # --remotes (default: false)+# All off by default+full = true # --full+branches = true # --branches+remotes = true # --remotes```**`wt step commit` and `wt merge` staging:**@@ -85,15 +86,15 @@ remotes = true # --remotes (default: false)stage = "all" # "all" (default), "tracked", or "none"```-**`wt merge` defaults:**+**`wt merge`:**```toml[merge]-# All options default to true-squash = false # --no-squash: preserve individual commits-commit = false # --no-commit: skip committing uncommitted changes-remove = false # --no-remove: keep worktree after merge-verify = false # --no-verify: skip project hooks+# These flags are on by default; set to false to disable+squash = false # Preserve individual commits (--no-squash)+commit = false # Skip committing uncommitted changes (--no-commit)+remove = false # Keep worktree after merge (--no-remove)+verify = false # Skip project hooks (--no-verify)```### LLM commit messagesdiff --git a/src/cli.rs b/src/cli.rsindex 0a9ebbc35..619cf3e19 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -720,17 +720,18 @@ worktree-path = ".worktrees/{{ branch }}"worktree-path = "../worktrees/{{ main_worktree }}/{{ branch }}"```-### Command defaults+### Command settings-Override default flag behavior for commands. Settings here apply unless explicitly overridden on the command line.+Set persistent flag values for commands. These apply unless explicitly overridden on the command line.-**`wt list` defaults:**+**`wt list`:**```toml[list]-full = true # --full (default: false)-branches = true # --branches (default: false)-remotes = true # --remotes (default: false)+# All off by default+full = true # --full+branches = true # --branches+remotes = true # --remotes```**`wt step commit` and `wt merge` staging:**@@ -740,15 +741,15 @@ remotes = true # --remotes (default: false)stage = "all" # "all" (default), "tracked", or "none"```-**`wt merge` defaults:**+**`wt merge`:**```toml[merge]-# All options default to true-squash = false # --no-squash: preserve individual commits-commit = false # --no-commit: skip committing uncommitted changes-remove = false # --no-remove: keep worktree after merge-verify = false # --no-verify: skip project hooks+# These flags are on by default; set to false to disable+squash = false # Preserve individual commits (--no-squash)+commit = false # Skip committing uncommitted changes (--no-commit)+remove = false # Keep worktree after merge (--no-remove)+verify = false # Skip project hooks (--no-verify)```### LLM commit messagesdiff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snapindex 99990edf6..6b8fdd715 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap@@ -91,30 +91,31 @@ Controls where new worktrees are created. The template is relative to the reposi[2m# Creates: ~/code/worktrees/myproject/feature-login[0m[2mworktree-path = "../worktrees/{{ main_worktree }}/{{ branch }}"[0m-[1mCommand defaults[0m+[1mCommand settings[0m-Override default flag behavior for commands. Settings here apply unless explicitly overridden on the command line.+Set persistent flag values for commands. These apply unless explicitly overridden on the command line.-[1m`wt list` defaults:[0m+[1m`wt list`:[0m[2m[list][0m- [2mfull = true # --full (default: false)[0m- [2mbranches = true # --branches (default: false)[0m- [2mremotes = true # --remotes (default: false)[0m+ [2m# All off by default[0m+ [2mfull = true # --full[0m+ [2mbranches = true # --branches[0m+ [2mremotes = true # --remotes[0m[1m`wt step commit` and `wt merge` staging:[0m[2m[commit][0m[2mstage = "all" # "all" (default), "tracked", or "none"[0m-[1m`wt merge` defaults:[0m+[1m`wt merge`:[0m[2m[merge][0m- [2m# All options default to true[0m- [2msquash = false # --no-squash: preserve individual commits[0m- [2mcommit = false # --no-commit: skip committing uncommitted changes[0m- [2mremove = false # --no-remove: keep worktree after merge[0m- [2mverify = false # --no-verify: skip project hooks[0m+ [2m# These flags are on by default; set to false to disable[0m+ [2msquash = false # Preserve individual commits (--no-squash)[0m+ [2mcommit = false # Skip committing uncommitted changes (--no-commit)[0m+ [2mremove = false # Keep worktree after merge (--no-remove)[0m+ [2mverify = false # Skip project hooks (--no-verify)[0m[1mLLM commit messages[0m