ianchesal/dotfiles/rebase

Rebase the current branch.

Arguments: $ARGUMENTS

Behavior:

• No arguments: rebase on the current branch's base branch, the one it was cut

from: git config branch.<current>.herdr-base (set by herdr's add-worktree popup and the /worktree skill), then branch.<current>.workmux-base, falling back to local main when neither is configured

• "origin": fetch origin, rebase on origin/main
• "origin/branch": fetch origin, rebase on origin/branch
• "branch": rebase on local branch (use "main" to force a rebase on local main)

Steps:

1. Check for local changes with git status --porcelain:

• If the working tree has staged, unstaged, or untracked changes, stash them

with git stash push --include-untracked -m "rebase skill".

• Remember whether this command created a stash. Existing stash entries must

remain untouched.

• If stashing fails, stop before fetching or rebasing.

1. Parse arguments:

• No args → target is the current branch's base branch: the first of

git config --get branch.$(git branch --show-current).herdr-base and git config --get branch.$(git branch --show-current).workmux-base that is set, else "main". No fetch.

• Contains "/" (e.g., "origin/develop") → split into remote and branch, fetch

remote, target is remote/branch

• Just "origin" → fetch origin, target is "origin/main"
• Anything else → target is that branch name, no fetch

1. If fetching, run: git fetch <remote>. If fetching or target resolution

fails before the rebase begins, restore the stash created in step 1 before stopping.

1. Run: git rebase <target>
2. If conflicts occur, handle them carefully (see below)
3. Continue until rebase is complete
4. If step 1 created a stash, restore it with git stash pop --index:

• Restore the stash only after the rebase succeeds.
• If restoration conflicts, preserve the stash, report the conflicts, and

leave the affected files for manual resolution.

Handling conflicts:

• BEFORE resolving any conflict, understand what changes were made to each

conflicting file in the target branch

• For each conflicting file, run git log -p -n 3 <target> -- <file> to see

recent changes to that file in the target branch

• The goal is to preserve BOTH the changes from the target branch AND our

branch's changes

• After resolving each conflict, stage the file and continue with

git rebase --continue

• If a conflict is too complex or unclear, ask for guidance before proceeding