skills.rest
maggit
maggitCOMMUNITY
Explore all skills by this author →
Website𝕏@raqueldotnycGitHub

rebase

Plan and execute non-interactive git rebase operations with safety checks.

Updated Feb 7, 2026
Search Tags:#git#workflow#safety#history#rebase#squash#conflicts
One-click install
npx skills add https://github.com/maggit/claude-workspace --skill rebase-maggit
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase
Source: https://github.com/maggit/claude-workspace/tree/main/skills/rebase
Command: npx skills add https://github.com/maggit/claude-workspace --skill rebase-maggit

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps with git rebase operations, including squashing, reordering, and cleaning up commit history, to make your branch history clearer before merging.

Core Features & Use Cases

  • Assess the current state with status, log, and branch checks to understand what needs rebasing.
  • Plan and propose a rebase strategy (e.g., squash commits, reorder, or drop) with user confirmation and safety backups.
  • Execute non-interactive rebase workflows that avoid manual editor prompts, handle conflicts with guided resolutions, and verify results.

Quick Start

Rebase the current branch onto main and squash the last two commits.

Frequently Asked Questions about rebase

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I squash commits on a local feature branch before merging?▼

You can squash commits using a planned non-interactive rebase workflow that requires user confirmation and creates a safety backup branch before modifying history.

What is the safest way to reorder git history without losing commits?▼

Safely reordering git history requires creating a backup branch, applying step-by-step safety checks, and using a non-interactive rebase workflow with guided conflict resolution before finalizing.

Can I run a non-interactive git rebase to clean up commit messages?▼

Yes, you can clean up commit messages through a non-interactive rebase workflow that avoids manual editor prompts, applies guided conflict resolutions, and verifies the final history results.

How do I handle rebase conflicts when squashing commits?▼

When squashing commits, rebase conflicts are handled through guided conflict resolution steps integrated into the non-interactive rebase workflow to ensure history is cleaned safely.

Does this git rebase workflow require manual editor prompts?▼

No, the workflow executes non-interactive rebase strategies that avoid manual editor prompts, allowing you to safely squash, reorder, and clean up commits while requiring user confirmation.

When should I use a backup branch before rebasing?▼

A backup branch should be created before rebasing whenever you plan to squash, reorder, or clean up local feature branch history, ensuring your original commits remain safe.

Related Skills

Explore More Software Engineering Skills→
Arist12Arist12

worktree-status

Report git worktree status in a Markdown table with branch, dirty, and merged states.

Community
Advanced
EmrebenerEmrebener

ss-sdd-finishing

Validate SDD state and merge the feature branch into main.

Community
Advanced
LauughterLauughter

git-workflow-and-versioning

Enforce disciplined Git workflows with atomic commits and short-lived branches.

Community
Intermediate
divad12divad12
25

merge

Rebases the current branch onto main and resolves conflicts interactively for Git workflows.

Community
Advanced