skills.rest
FutureAtoms
FutureAtomsCOMMUNITY
Explore all skills by this author →
GitHub

git-github-rebase

Perform interactive Git rebasing to squash, fixup, reword, reorder, or drop commits.

1|Updated Mar 11, 2026
Search Tags:#git#git workflow#github#rebase#commit history#interactive rebase
One-click install
npx skills add https://github.com/FutureAtoms/claude-skills-backup --skill git-github-rebase
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-github-rebase
Source: https://github.com/FutureAtoms/claude-skills-backup/tree/main/git-github-rebase
Command: npx skills add https://github.com/FutureAtoms/claude-skills-backup --skill git-github-rebase

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill helps you safely clean up your Git commit history by performing interactive rebasing operations, making your project history more readable and manageable.

Core Features & Use Cases

  • Interactive Rebase: Safely reorder, squash, fixup, reword, or drop commits.
  • Conflict Resolution: Provides guidance on how to handle conflicts during a rebase.
  • Safety Checks: Emphasizes best practices to avoid rebasing shared branches and includes recovery steps.
  • Use Case: You've made several small, messy commits on a feature branch. Use this Skill to squash them into a single, clean commit before merging.

Quick Start

Use the git-github-rebase skill to interactively rebase the last 5 commits onto the main branch.

Frequently Asked Questions about git-github-rebase

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

FAQPage Schema
How do I squash multiple commits into one clean commit before merging?▼

Squashing multiple commits requires an interactive Git rebase to reorder, fixup, or combine messy commits into a single clean history before merging. This Skill guides you through safely squashing commits for a comprehensible project history.

What is interactive Git rebase and when should I use it?▼

Interactive Git rebase is a mechanism to safely reword, reorder, or drop commits. You need this process when your feature branch history becomes messy and requires cleaning up to maintain a linear, comprehensible project history.

How do I resolve merge conflicts during a Git rebase?▼

Resolving conflicts during a Git rebase requires stopping the process, fixing the conflicting files, and continuing with specific Git commands. This Skill provides detailed guidance on handling conflict resolution and completing the rebase.

When should I avoid rebasing shared branches in Git?▼

You should avoid rebasing shared branches because rewriting history can break collaborators' local repositories. This Skill emphasizes best practices for shared branches and includes recovery steps to ensure safe collaborative development.

Can I reword or drop specific commits from my Git history?▼

Yes, interactive rebasing allows you to safely reword commit messages or drop commits entirely. This Skill facilitates these specific operations to help you clean up commit history and make your project more manageable.

Related Skills

Explore More Software Engineering Skills→
shaun0927shaun0927

git-master

Automate atomic commits, interactive rebasing, and branch management in Git.

Community
Advanced
jcdendritejcdendrite
4

git-feature-branch-sync

Synchronize a divergent Git feature branch with the remote default branch.

Community
Advanced
kirvinkirvin

sync

Fetch upstream changes and rebase the current Git branch onto them.

Community
Intermediate
latestaiagentslatestaiagents
5

rebase-safely

Guides Git rebase operations with conflict resolution and recovery via reflog.

Official
Advanced