Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Flatten "Setting overrides" into parent section, remove experimental (#1839)
Maximilian Roos3292b4fe08be
diff --git a/dev/config.example.toml b/dev/config.example.tomlindex ed00815b0..47cadc080 100644--- a/dev/config.example.toml+++ b/dev/config.example.toml@@ -139,11 +139,7 @@# - User configs generally apply to all projects.# - User configs _also_ has a `[projects]` table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.#-# Entries are keyed by project identifier (e.g., `github.com/user/repo`).-#-# #### Setting overrides [experimental]-#-# Override global user config for a specific project. Scalar values (like `worktree-path`) replace the global value; everything else (hooks, aliases, etc.) appends, global first.+# Entries are keyed by project identifier (e.g., `github.com/user/repo`). Scalar values (like `worktree-path`) replace the global value; everything else (hooks, aliases, etc.) appends, global first.## [projects."github.com/user/repo"]# worktree-path = ".worktrees/{{ branch | sanitize }}"diff --git a/docs/content/config.md b/docs/content/config.mdindex 4d6de6c10..a995c7783 100644--- a/docs/content/config.md+++ b/docs/content/config.md@@ -231,13 +231,7 @@ For context:- User configs generally apply to all projects.- User configs _also_ has a `[projects]` table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.-Entries are keyed by project identifier (e.g., `github.com/user/repo`).--#### Setting overrides--<span class="badge-experimental"></span>--Override global user config for a specific project. Scalar values (like `worktree-path`) replace the global value; everything else (hooks, aliases, etc.) appends, global first.+Entries are keyed by project identifier (e.g., `github.com/user/repo`). Scalar values (like `worktree-path`) replace the global value; everything else (hooks, aliases, etc.) appends, global first.```toml[projects."github.com/user/repo"]diff --git a/docs/content/hook.md b/docs/content/hook.mdindex 6622e2814..71497ea5c 100644--- a/docs/content/hook.md+++ b/docs/content/hook.md@@ -87,7 +87,7 @@ For pre-* hooks, commands in a table run sequentially. For post-* hooks, they ru| Aspect | Project hooks | User hooks ||--------|--------------|------------|| Location | `.config/wt.toml` | `~/.config/worktrunk/config.toml` |-| Scope | Single repository | All repositories (or [per-project](@/config.md#setting-overrides)) |+| Scope | Single repository | All repositories (or [per-project](@/config.md#user-project-specific-settings)) || Approval | Required | Not required || Execution order | After user hooks | First |diff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.mdindex f038835b9..9fcbfd1d5 100644--- a/skills/worktrunk/reference/config.md+++ b/skills/worktrunk/reference/config.md@@ -230,11 +230,7 @@ For context:- User configs generally apply to all projects.- User configs _also_ has a `[projects]` table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.-Entries are keyed by project identifier (e.g., `github.com/user/repo`).--#### Setting overrides [experimental]--Override global user config for a specific project. Scalar values (like `worktree-path`) replace the global value; everything else (hooks, aliases, etc.) appends, global first.+Entries are keyed by project identifier (e.g., `github.com/user/repo`). Scalar values (like `worktree-path`) replace the global value; everything else (hooks, aliases, etc.) appends, global first.```toml[projects."github.com/user/repo"]diff --git a/skills/worktrunk/reference/hook.md b/skills/worktrunk/reference/hook.mdindex 7f4e2f816..056ca7216 100644--- a/skills/worktrunk/reference/hook.md+++ b/skills/worktrunk/reference/hook.md@@ -78,7 +78,7 @@ For pre-* hooks, commands in a table run sequentially. For post-* hooks, they ru| Aspect | Project hooks | User hooks ||--------|--------------|------------|| Location | `.config/wt.toml` | `~/.config/worktrunk/config.toml` |-| Scope | Single repository | All repositories (or [per-project](https://worktrunk.dev/config/#setting-overrides)) |+| Scope | Single repository | All repositories (or [per-project](https://worktrunk.dev/config/#user-project-specific-settings)) || Approval | Required | Not required || Execution order | After user hooks | First |diff --git a/src/cli/mod.rs b/src/cli/mod.rsindex de5b977da..c8ead811b 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -1191,7 +1191,7 @@ For pre-* hooks, commands in a table run sequentially. For post-* hooks, they ru| Aspect | Project hooks | User hooks ||--------|--------------|------------|| Location | `.config/wt.toml` | `~/.config/worktrunk/config.toml` |-| Scope | Single repository | All repositories (or [per-project](@/config.md#setting-overrides)) |+| Scope | Single repository | All repositories (or [per-project](@/config.md#user-project-specific-settings)) || Approval | Required | Not required || Execution order | After user hooks | First |@@ -1801,11 +1801,7 @@ For context:- User configs generally apply to all projects.- User configs _also_ has a `[projects]` table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.-Entries are keyed by project identifier (e.g., `github.com/user/repo`).--#### Setting overrides [experimental]--Override global user config for a specific project. Scalar values (like `worktree-path`) replace the global value; everything else (hooks, aliases, etc.) appends, global first.+Entries are keyed by project identifier (e.g., `github.com/user/repo`). Scalar values (like `worktree-path`) replace the global value; everything else (hooks, aliases, etc.) appends, global first.```toml[projects."github.com/user/repo"]diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snapindex c50273a6e..7da94c3a5 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap@@ -198,11 +198,7 @@ Creates [2m~/.config/worktrunk/config.toml[0m with the following content:[107m [0m [2m# - User configs generally apply to all projects.[0m[107m [0m [2m# - User configs _also_ has a `[projects]` table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.[0m[107m [0m [2m#[0m-[107m [0m [2m# Entries are keyed by project identifier (e.g., `github.com/user/repo`).[0m-[107m [0m [2m#[0m-[107m [0m [2m# #### Setting overrides [experimental][0m-[107m [0m [2m#[0m-[107m [0m [2m# Override global user config for a specific project. Scalar values (like `worktree-path`) replace the global value; everything else (hooks, aliases, etc.) appends, global first.[0m+[107m [0m [2m# Entries are keyed by project identifier (e.g., `github.com/user/repo`). Scalar values (like `worktree-path`) replace the global value; everything else (hooks, aliases, etc.) appends, global first.[0m[107m [0m [2m#[0m[107m [0m [2m# [projects."github.com/user/repo"][0m[107m [0m [2m# worktree-path = ".worktrees/{{ branch | sanitize }}"[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snapindex 331b36404..39adf47b0 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap@@ -244,11 +244,7 @@ For context:- User configs generally apply to all projects.- User configs _also_ has a [2m[projects][0m table which holds project-specific settings for the user, such as worktree layout and setting overrides. That's what this section covers.-Entries are keyed by project identifier (e.g., [2mgithub.com/user/repo[0m).--[1mSetting overrides [experimental][0m--Override global user config for a specific project. Scalar values (like [2mworktree-path[0m) replace the global value; everything else (hooks, aliases, etc.) appends, global first.+Entries are keyed by project identifier (e.g., [2mgithub.com/user/repo[0m). Scalar values (like [2mworktree-path[0m) replace the global value; everything else (hooks, aliases, etc.) appends, global first.[107m [0m [2m[36m[projects."github.com/user/repo"][0m[107m [0m [2mworktree-path = [0m[2m[32m".worktrees/{{ branch | sanitize }}"[0m