git-workflow

Manage Git repository history through atomic commits, interactive rebasing, and automated bisection.

25|3|Updated Jul 14, 2026
One-click install
npx skills add https://github.com/nimadorostkar/Claude-Skills-collection --skill git-workflow-nimadorostkar
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/nimadorostkar/Claude-Skills-collection/tree/main/skills/development/git-workflow
Command: npx skills add https://github.com/nimadorostkar/Claude-Skills-collection --skill git-workflow-nimadorostkar

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill eliminates messy, unreadable commit histories and provides a safety net for recovering from common Git mistakes like bad rebases or accidental deletions.

Core Features & Use Cases

  • History Hygiene: Tools for interactive rebasing, squashing, and atomic commit construction to ensure a clean, logical project history.
  • Disaster Recovery: Procedures for using reflog and other low-level commands to restore lost work or undo destructive operations.
  • Regression Hunting: Automated bisection workflows to quickly identify the specific commit that introduced a bug.

Quick Start

Use the git-workflow skill to help me clean up my current feature branch history before I open a pull request.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I clean up a messy git history before opening a pull request?

Clean up a messy git history by using interactive rebasing to squash commits and construct atomic, logical commits. This process rewrites your feature branch history to ensure a readable project timeline before code review.

How do I recover lost work after a bad rebase or accidental branch deletion?

Recover lost work after a bad rebase or accidental deletion by using git reflog and low-level commands to restore previous repository states. This disaster recovery process reverses destructive operations and retrieves dangling commits.

What's the best way to find which commit introduced a bug using version control?

Find the specific commit that introduced a bug by running an automated git bisection workflow. This regression hunting process systematically checks out commits between known good and bad states to quickly isolate the defect.

Do I need standard Git CLI access to rewrite repository history?

Yes, standard Git CLI access is required to perform history rewriting and state restoration operations. The version control tasks rely on command-line execution for interactive rebasing, bisection, and reflog-based recovery.

When should I not use interactive rebasing on my branches?

You should avoid interactive rebasing on shared branches that others have already pulled, as rewriting history creates divergent commit states. Restrict history rewriting to local feature branches before they are merged into the main project timeline.

Can I resolve merge conflicts automatically when squashing commits?

Conflict resolution is facilitated during interactive rebasing when squashing commits, but it requires manual intervention to select correct code blocks. The process helps manage branch hygiene by guiding you through resolving overlapping changes logically.