Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Clarify merge command description and target branch behavior
Maximilian Roosdfc4ddea6b5e
diff --git a/.claude-plugin/skills/worktrunk/reference/merge.md b/.claude-plugin/skills/worktrunk/reference/merge.mdindex 9f185d72f..c921a3205 100644--- a/.claude-plugin/skills/worktrunk/reference/merge.md+++ b/.claude-plugin/skills/worktrunk/reference/merge.md@@ -1,6 +1,6 @@# wt merge-Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.+Merge the current branch into the target branch, defaulting to the main branch. Unlike `git merge`, this merges the current branch into a target (rather than a target into the current branch). Similar to clicking "Merge pull request" on GitHub.## Examplesdiff --git a/docs/content/merge.md b/docs/content/merge.mdindex cf374e80a..186be448e 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 -->-Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.+Merge the current branch into the target branch, defaulting to the main branch. Unlike `git merge`, this merges the current branch into a target (rather than a target into the current branch). Similar to clicking "Merge pull request" on GitHub.<figure class="demo"><picture>diff --git a/src/cli/mod.rs b/src/cli/mod.rsindex 4cc712ecb..62ce4ed07 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -751,7 +751,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#"Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.+ after_long_help = r#"Merge the current branch into the target branch, defaulting to the main branch. Unlike `git merge`, this merges the current branch into a target (rather than a target into the current branch). Similar to 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 47a824031..a1fdc73f7 100644--- a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_md_merge.snap@@ -7,7 +7,7 @@ info:- "--help-md"env:CLICOLOR_FORCE: "1"- COLUMNS: "150"+ COLUMNS: "500"GIT_EDITOR: ""RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"@@ -70,7 +70,7 @@ Global Options:-v, --verbose...Show debug info (-v), or also write diagnostic report (-vv)-Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.+Merge the current branch into the target branch, defaulting to the main branch. Unlike `git merge`, this merges the current branch into a target (rather than a target into the current branch). Similar to 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 c337dfc95..46352aa31 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--verbose[0m[36m...Show debug info (-v), or also write diagnostic report (-vv)-Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.+Merge the current branch into the target branch, defaulting to the main branch. Unlike [2mgit merge[0m, this merges the current branch into a target (rather than a target into the current branch). Similar to 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 6b0badbb7..be0598a8c 100644--- a/tests/snapshots/integration__integration_tests__help__help_page_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_page_merge.snap@@ -7,7 +7,7 @@ info:- "--help-page"env:CLICOLOR_FORCE: "1"- COLUMNS: "150"+ COLUMNS: "500"GIT_EDITOR: ""RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"@@ -20,7 +20,7 @@ exit_code: 0----- stdout -----<!-- ⚠️ AUTO-GENERATED from `wt merge --help-page` — edit cli.rs to update -->-Merge the current branch into the default branch — like clicking "Merge pull request" on GitHub.+Merge the current branch into the target branch, defaulting to the main branch. Unlike `git merge`, this merges the current branch into a target (rather than a target into the current branch). Similar to clicking "Merge pull request" on GitHub.<figure class="demo"><picture>