Skip to content

docs: regenerate merge/step help and docs for --author flag #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bennyjitsu merged 1 commit into from
Sep 20, 2026
Merged

docs: regenerate merge/step help and docs for --author flag #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/src/content/docs/merge.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ Options:
- tracked: Stage tracked changes only (like git add -u)
- none: Stage nothing, commit only what's already in the index

--author <AUTHOR>
Commit author (Name <email>); committer stays the ambient identity

-h, --help
Print help (see a summary with '-h')

Expand Down
6 changes: 6 additions & 0 deletions docs/src/content/docs/step.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ Options:
- tracked: Stage tracked changes only (like git add -u)
- none: Stage nothing, commit only what's already in the index

--author <AUTHOR>
Commit author (Name <email>); committer stays the ambient identity

--dry-run
Preview prompt, command, and generated message without committing

Expand Down Expand Up @@ -259,6 +262,9 @@ Options:
- tracked: Stage tracked changes only (like git add -u)
- none: Stage nothing, commit only what's already in the index

--author <AUTHOR>
Commit author (Name <email>); committer stays the ambient identity

--dry-run
Preview prompt, command, and generated message without squashing

Expand Down
3 changes: 3 additions & 0 deletions plugins/worktrunk/skills/worktrunk/reference/merge.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions plugins/worktrunk/skills/worktrunk/reference/step.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions skills/worktrunk/reference/merge.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions skills/worktrunk/reference/step.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions tests/snapshots/integration__integration_tests__help__help_md_merge.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ Options:
- tracked: Stage tracked changes only (like git add -u)
- none: Stage nothing, commit only what's already in the index

--author <AUTHOR>
Commit author (Name <email>); committer stays the ambient identity

-h, --help
Print help (see a summary with '-h')

Expand Down
3 changes: 3 additions & 0 deletions tests/snapshots/integration__integration_tests__help__help_merge_long.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ Usage: wt merge [OPTIONS] [TARGET]
- tracked: Stage tracked changes only (like git add -u)
- none: Stage nothing, commit only what's already in the index

--author <AUTHOR>
Commit author (Name <email>); committer stays the ambient identity

-h, --help
Print help (see a summary with '-h')

Expand Down
15 changes: 8 additions & 7 deletions tests/snapshots/integration__integration_tests__help__help_merge_short.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,14 @@ Usage: wt merge [OPTIONS] [TARGET]
[TARGET] Target branch

Options:
--no-squash Skip commit squashing
--no-commit Skip commit and squash
--no-rebase Skip rebase; require the target to fast-forward to the resulting tip
--no-remove Keep worktree after merge
--no-ff Create a merge commit (no fast-forward)
--stage <STAGE> What to stage before committing [default: all] [possible values: all, tracked, none]
-h, --help Print help (see more with '--help')
--no-squash Skip commit squashing
--no-commit Skip commit and squash
--no-rebase Skip rebase; require the target to fast-forward to the resulting tip
--no-remove Keep worktree after merge
--no-ff Create a merge commit (no fast-forward)
--stage <STAGE> What to stage before committing [default: all] [possible values: all, tracked, none]
--author <AUTHOR> Commit author (Name <email>); committer stays the ambient identity
-h, --help Print help (see more with '--help')

Automation:
--no-hooks Skip hooks
Expand Down
Loading