NodeJSmith/mine.worktree-rebase

Arguments

$ARGUMENTS — optional, natural language. Parse for two things:

1. Target branch — anything that looks like a branch name (e.g., feature/jsmith/foo, main). If provided, skip auto-detection and rebase onto this branch.
2. Skip confirmation — any intent to skip the prompt: force, just rebase, no prompt, skip prompt, yes, -y. If present, skip Phase 4 confirmation.

Both are independent and can be combined.

Examples:

• /mine.worktree-rebase — auto-detect, confirm before rebasing
• /mine.worktree-rebase just rebase — auto-detect, no confirmation
• /mine.worktree-rebase feature/jsmith/foo — explicit branch, confirm
• /mine.worktree-rebase feature/jsmith/foo force — explicit branch, no confirmation

Context

• Git dir: !git rev-parse --git-dir
• Current worktree branch: !git branch --show-current
• Default branch: !git-default-branch

Your task

Detect whether the parent repo is currently on a non-default branch, and offer to rebase this worktree onto it. For best results, run this immediately after entering a new worktree.

Phase 1 — Verify you are inside a worktree

Check the Context above. If the Git dir value does not contain worktrees/, stop immediately:

This skill only works from inside a git worktree. The current git dir is not a worktree path. Nothing to do.

Phase 2 — Discover the target branch

If $ARGUMENTS contains a target branch (see Arguments), use that as <orig-branch> and skip to Phase 3.

Otherwise, auto-detect from the parent repo. Run these commands sequentially. Do NOT use $(...) command substitution (see CLAUDE.md bash restrictions).

Step 1 — Get the shared git directory:

git rev-parse --git-common-dir

Note the output — call it <common-git-dir>.

Step 2 — Derive the original repo root. Use the exact path from Step 1 — substitute it directly (no pipes, no xargs — handles spaces in paths correctly):

dirname <common-git-dir>

For example, if Step 1 returned /home/jessica/Claudefiles/.git, run dirname /home/jessica/Claudefiles/.git. Note the output — call it <orig-root>.

Step 3 — Read the current branch of the original repo. Use the exact path from Step 2:

git -C <orig-root> symbolic-ref --short HEAD 2>/dev/null

• If this exits 0 and prints a branch name → that is <orig-branch>.
• If this exits non-zero (detached HEAD or error) → treat <orig-branch> as the default branch (no rebase needed).

Phase 3 — Check if a rebase is needed

Compare <orig-branch> to the default branch from Context.

If they are the same → stop with a friendly message:

The parent repo is currently on <default-branch>. No rebase needed.

Phase 4 — Show the situation and confirm

Display a summary:

Parent repo branch : <orig-branch>
Worktree branch    : <current-branch>
Worktree base      : origin/<default-branch>

This worktree's base is assumed to be `origin/<default-branch>`, but the parent repo is currently on `<orig-branch>`.
Rebasing will move this worktree's commits on top of `<orig-branch>`.

If $ARGUMENTS indicates skipping confirmation (see Arguments), proceed directly to Phase 5.

Otherwise, ask the user to confirm using AskUserQuestion:

• question: "Rebase <current-branch> onto <orig-branch>?"
• header: Worktree rebase
• options:
  • Yes — rebase onto <orig-branch> (description: git rebase --onto <orig-branch> origin/<default-branch>)
  • No — leave as-is (description: Keep the current base (origin/<default-branch>))

If the user selects "No", stop with: "No changes made."

Phase 5 — Pre-flight check

Verify the working tree is clean before rebasing:

git status --porcelain

If the output is non-empty, stop with:

The working tree has uncommitted changes. Commit or stash them before rebasing.

Phase 6 — Execute the rebase

Fetch to ensure refs are current before rebasing:

git fetch origin

Then run:

git rebase --onto <orig-branch> origin/<default-branch>

If the rebase succeeds (exit 0):

git log --oneline -5

Then confirm:

Rebase complete. <current-branch> is now based on <orig-branch>.

If the rebase exits non-zero (conflict), print:

Rebase conflict. Resolve the conflicts, then run:

git rebase --continue

Or to abort and return to the original state:

git rebase --abort

Do not attempt to auto-resolve conflicts. Stop here.