dixus

Rebase Master — Git skill for Claude Code

Git community

Fetch origin/master and rebase the current branch onto it.

How to install Rebase Master

Installs to ~/.claude/commands/dixus-claudeframework-rebase-master.md

Terminal

mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/dixus/claudeframework/HEAD/.claude/commands/rebase-master.md -o ~/.claude/commands/dixus-claudeframework-rebase-master.md

Restart Claude Code, or start a new session, for it to be picked up.

What Rebase Master does

description: Fetch origin/master and rebase the current branch onto it

Rebase the current branch onto the latest `origin/master`:

Run git fetch origin master to get the latest master.
Check for uncommitted changes with git status --short. If there are any, stash them with git stash push -m "auto-stash before rebase".
Run git rebase origin/master.
If there are merge conflicts:
- Show the conflicted files.
- For each conflict, read the file, resolve it by keepin

Alternatives in Git

Ws Reset — Reset the current branch to main, fetch upstream, and update submodules 38.1k ★
Clean Worktrees (Automatic) — Automatically remove all worktrees for branches merged into master 25.5k ★
Git Master 24.1k ★