Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Clarify wt merge runs from feature worktree
Maximilian Roosaae3f0808c54
diff --git a/docs/content/faq.md b/docs/content/faq.mdindex 735a1f9d0..ca6c1608f 100644--- a/docs/content/faq.md+++ b/docs/content/faq.md@@ -62,9 +62,11 @@ Worktrunk automates the full lifecycle:```bashwt switch --create feature-branch # Creates worktree, runs setup hooks# ...work...-wt merge # Squashes, merges, removes worktree+wt merge # Merges into default branch, cleans up```+No cd back to main — `wt merge` runs from the feature worktree and merges into the target, like GitHub's merge button.+What `git worktree` doesn't provide:- Consistent directory naming and cleanup validationdiff --git a/docs/content/merge.md b/docs/content/merge.mdindex ab8599928..698089938 100644--- a/docs/content/merge.md+++ b/docs/content/merge.md@@ -15,9 +15,11 @@ group = "Commands"</picture></figure>+Run from a feature worktree to merge into the default branch — like clicking "Merge pull request" on GitHub.+## Examples-Basic merge to the default branch:+Merge to the default branch:```bashwt mergediff --git a/src/cli.rs b/src/cli.rsindex c30740659..76198f90c 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -2302,9 +2302,11 @@ Removal runs in the background by default (returns immediately). Logs are writte/// Squashes commits, rebases, runs hooks, merges to target, and removes the worktree.#[command(after_long_help = r#"<!-- demo: wt-merge.gif 1600x900 -->+Run from a feature worktree to merge into the default branch — like clicking "Merge pull request" on GitHub.+## Examples-Basic merge to the default branch:+Merge to the default branch:```consolewt mergediff --git a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap b/tests/snapshots/integration__integration_tests__help__help_md_merge.snapindex 33bd89a31..f2b4eef06 100644--- a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_md_merge.snap@@ -8,7 +8,7 @@ info:env:CLICOLOR_FORCE: "1"COLUMNS: "150"- GIT_CONFIG_GLOBAL: ""+ GIT_EDITOR: ""RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml@@ -70,9 +70,11 @@ Global Options:<!-- demo: wt-merge.gif 1600x900 -->+Run from a feature worktree to merge into the default branch — like clicking "Merge pull request" on GitHub.+## Examples-Basic merge to the default branch:+Merge to the default branch:```bashwt mergediff --git a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap b/tests/snapshots/integration__integration_tests__help__help_merge_long.snapindex 5179d0e8b..e92c794df 100644--- a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap@@ -8,7 +8,7 @@ info:env:CLICOLOR_FORCE: "1"COLUMNS: "150"- GIT_CONFIG_GLOBAL: ""+ GIT_EDITOR: ""RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml@@ -71,9 +71,11 @@ Usage: [1m[36mwt merge[0m [36m[OPTIONS][0m [36m[TARGET]Show commands and debug info+Run from a feature worktree to merge into the default branch — like clicking "Merge pull request" on GitHub.+[32mExamples-Basic merge to the default branch:+Merge to the default branch:[2mwt mergediff --git a/tests/snapshots/integration__integration_tests__help__help_page_merge.snap b/tests/snapshots/integration__integration_tests__help__help_page_merge.snapindex 98ebbda72..b2a482dcb 100644--- a/tests/snapshots/integration__integration_tests__help__help_page_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_page_merge.snap@@ -8,7 +8,7 @@ info:env:CLICOLOR_FORCE: "1"COLUMNS: "150"- GIT_CONFIG_GLOBAL: ""+ GIT_EDITOR: ""RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml@@ -25,9 +25,11 @@ exit_code: 0</picture></figure>+Run from a feature worktree to merge into the default branch — like clicking "Merge pull request" on GitHub.+## Examples-Basic merge to the default branch:+Merge to the default branch:```bashwt merge