Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
refactor: update merge command help text
Maximilian Roos7e06824bd150
diff --git a/docs/content/merge.md b/docs/content/merge.mdindex e7e53f2d3..65836a47d 100644--- a/docs/content/merge.md+++ b/docs/content/merge.md@@ -8,7 +8,7 @@ group = "Commands"<!-- ⚠️ AUTO-GENERATED from `wt merge --help-page` — edit cli.rs to update -->-Run from a feature worktree to merge into the default branch — like clicking "Merge pull request" on GitHub.+Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.<figure class="demo"><picture>diff --git a/src/cli.rs b/src/cli.rsindex 3d762488f..c8f3b1e99 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -2492,7 +2492,7 @@ Removal runs in the background by default (returns immediately). Logs are writte////// Squash & rebase, fast-forward target, remove the worktree.#[command(- after_long_help = r#"Run from a feature worktree to merge into the default branch — like clicking "Merge pull request" on GitHub.+ after_long_help = r#"Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.<!-- demo: wt-merge.gif 1600x900 -->## Examplesdiff --git a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap b/tests/snapshots/integration__integration_tests__help__help_md_merge.snapindex 503bb06a0..2add29f89 100644--- a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_md_merge.snap@@ -70,7 +70,7 @@ Global Options:-v, --verboseShow commands and debug info-Run from a feature worktree to merge into the default branch — like clicking "Merge pull request" on GitHub.+Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.<!-- demo: wt-merge.gif 1600x900 -->## Examplesdiff --git a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap b/tests/snapshots/integration__integration_tests__help__help_merge_long.snapindex 326d20750..3ddd6baef 100644--- a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap@@ -72,7 +72,7 @@ Usage: [1m[36mwt merge[0m [36m[OPTIONS][0m [36m[TARGET][1m[36m-v[0m, [1m[36m--verboseShow commands and debug info-Run from a feature worktree to merge into the default branch — like clicking "Merge pull request" on GitHub.+Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.[32mExamplesdiff --git a/tests/snapshots/integration__integration_tests__help__help_page_merge.snap b/tests/snapshots/integration__integration_tests__help__help_page_merge.snapindex a2a1f346d..c0907a61f 100644--- a/tests/snapshots/integration__integration_tests__help__help_page_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_page_merge.snap@@ -20,7 +20,7 @@ exit_code: 0----- stdout -----<!-- ⚠️ AUTO-GENERATED from `wt merge --help-page` — edit cli.rs to update -->-Run from a feature worktree to merge into the default branch — like clicking "Merge pull request" on GitHub.+Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.<figure class="demo"><picture>