Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Fix docs for approvals and post-merge timing (#119)
Maximilian Roos4d97ac1f53b2
diff --git a/dev/wt.example.toml b/dev/wt.example.tomlindex cd14cc6a4..43f5d2479 100644--- a/dev/wt.example.toml+++ b/dev/wt.example.toml@@ -73,7 +73,7 @@# Post-Merge Hook# Runs SEQUENTIALLY in the main worktree after successful merge (blocking)-# Runs after push succeeds but before cleanup+# Runs after push and cleanup complete# Use for: updating production builds, notifications, cleanup## Single command:diff --git a/docs/content/config.md b/docs/content/config.mdindex 8abb854bb..5dcf91d86 100644--- a/docs/content/config.md+++ b/docs/content/config.md@@ -127,7 +127,7 @@ approved-commands = []```-Manage approvals with `wt config approvals list` and `wt config approvals clear <repo>`.+Manage approvals with `wt config approvals add` and `wt config approvals clear <repo>`.## Project config@@ -492,7 +492,7 @@ With `--project`, creates `.config/wt.toml` in the current repository:# Post-Merge Hook# Runs SEQUENTIALLY in the main worktree after successful merge (blocking)-# Runs after push succeeds but before cleanup+# Runs after push and cleanup complete# Use for: updating production builds, notifications, cleanup## Single command:diff --git a/src/cli.rs b/src/cli.rsindex f84437d5c..4e92aec39 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -876,7 +876,7 @@ approved-commands = []```-Manage approvals with `wt config approvals list` and `wt config approvals clear <repo>`.+Manage approvals with `wt config approvals add` and `wt config approvals clear <repo>`.## Project configdiff --git a/src/config/project.rs b/src/config/project.rsindex 084da2943..6e8100f5c 100644--- a/src/config/project.rs+++ b/src/config/project.rs@@ -64,7 +64,7 @@ pub struct ProjectConfig {/// Commands to execute after successful merge in the main worktree (blocking)/// Supports string (single command) or table (named, sequential)- /// Runs after push succeeds but before cleanup+ /// Runs after push and cleanup complete////// Available template variables: `{{ repo }}`, `{{ branch }}`, `{{ worktree }}`, `{{ worktree_name }}`, `{{ repo_root }}`, `{{ default_branch }}`, `{{ commit }}`, `{{ short_commit }}`, `{{ remote }}`, `{{ upstream }}`, `{{ target }}`#[serde(default, rename = "post-merge")]diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snapindex ded7c85a1..80366e781 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap@@ -313,7 +313,7 @@ With [2m--project[0m, creates [2m.config/wt.toml[0m in the current repositor[2m[0m[2m# Post-Merge Hook[0m[2m# Runs SEQUENTIALLY in the main worktree after successful merge (blocking)[0m- [2m# Runs after push succeeds but before cleanup[0m+ [2m# Runs after push and cleanup complete[0m[2m# Use for: updating production builds, notifications, cleanup[0m[2m#[0m[2m# Single command:[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snapindex adf681ce6..bebfd1f4c 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap@@ -142,7 +142,7 @@ When project hooks run for the first time, Worktrunk prompts for approval. Appro[2m "pre-merge.test = npm test",[0m[2m][0m-Manage approvals with [2mwt config approvals list[0m and [2mwt config approvals clear <repo>[0m.+Manage approvals with [2mwt config approvals add[0m and [2mwt config approvals clear <repo>[0m.[32mProject config[0m