Stats
Actions
Tags
Help us improve
Share bugs, ideas, or general feedback.
From workmux-status
Commits staged changes, rebases onto the configured base branch, and merges via workmux. Handles rebase conflicts by reviewing base branch history.
npx claudepluginhub raine/workmux --plugin workmux-statusHow this skill is triggered — by the user, by Claude, or both
Slash command
/workmux-status:mergeThis skill is limited to the following tools:
The summary Claude sees in its skill listing — used to decide when to auto-load this skill
<!-- Customize the commit style and rebase behavior to match your workflow. -->
Rebases the current feature branch onto the base branch (main/master/develop) to keep it up-to-date and prevent merge conflicts.
Squash-merges git worktree branch to target branch with structured commit message based on change categorization. Validates retrospective completion and clean tree first.
Rebases current branch on local main, remote branch, or specified branch with smart conflict resolution. Handles fetch, rebase, and conflict resolution using target branch history.
Share bugs, ideas, or general feedback.
Arguments: $ARGUMENTS
Check the arguments for flags:
--keep, -k → pass --keep to workmux merge (keeps the worktree and tmux window after merging)--no-verify, -n → pass --no-verify to workmux mergeStrip all flags from arguments.
Commit, rebase, and merge the current branch.
This command finishes work on the current branch by:
workmux merge to merge and clean upIf there are staged changes, commit them. Use lowercase, imperative mood, no conventional commit prefixes. Skip if nothing is staged.
Get the base branch from git config:
git config --local --get "branch.$(git branch --show-current).workmux-base"
If no base branch is configured, default to "main".
Rebase onto the local base branch (do NOT fetch from origin first):
git rebase <base-branch>
IMPORTANT: Do NOT run git fetch. Do NOT rebase onto origin/<branch>. Only rebase onto the local branch name (e.g., git rebase main, not git rebase origin/main).
If conflicts occur:
git log -p -n 3 <base-branch> -- <file> to
see recent changes to that file in the base branchgit rebase --continueRun: workmux merge --rebase --notification [--keep] [--no-verify]
Include --keep only if the --keep flag was passed in arguments.
Include --no-verify only if the --no-verify flag was passed in arguments.
This will merge the branch into the base branch and clean up the worktree and
tmux window (unless --keep is used).