Rebase Master banner
dixus dixus

Rebase Master

Git community

Description

--- description: Fetch origin/master and rebase the current branch onto it --- Rebase the current branch onto the latest `origin/master`: 1. Run `git fetch origin master` to get the latest master. 2. Check for uncommitted changes with `git status --short`. If there are any, stash them with `git stash push -m "auto-stash before rebase"`. 3. Run `git rebase origin/master`. 4. If there are merge conflicts: - Show the conflicted files. - For each conflict, read the file, resolve it by keepin

Installation

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.

Full documentation available on GitHub

View Source Repository