Can I use this to recover lost work?

Yes, it includes specific patterns for using the Git reflog to find and restore 'lost' commits, even after hard resets or branch deletions.

Why does it prefer rebase over merge?

The skill prioritizes rebasing to maintain a linear project history, which makes debugging with git bisect and reviewing PRs significantly easier.

Does it support safe force-pushing?

Yes, it enforces the use of --force-with-lease to ensure you don't accidentally overwrite a teammate's work on shared feature branches.

How does this skill help with atomic commits?

It provides checklists and commands for interactive staging (git add -p), ensuring each commit represents exactly one logical change that is independent and testable.

Is this skill compatible with existing Git setups?

Absolutely. It uses standard Git commands and best practices that work with any repository following GitHub Flow or similar lightweight branching models.

Git Workflow & History Management

Name: Git Workflow & History Management
Author: yonatangross

byyonatangross

•

Developer Tools

Orchestrates a professional Git development cycle through atomic commits, GitHub Flow branching, and robust history recovery patterns.

The Git Workflow skill empowers Claude to manage repository history with expert-level precision, focusing on the GitHub Flow model. It implements standardized branch naming, enforces atomic commit principles for easier code reviews, and utilizes interactive staging to ensure every change is intentional. Beyond standard operations, it provides a comprehensive safety net using Git reflog to recover from mistakes like accidental resets or lost commits, making it essential for teams demanding a clean, linear, and production-ready codebase.

Key Features

01Standardized GitHub Flow branching with automated naming conventions.

0269 GitHub stars

03Atomic commit enforcement for granular, independent, and revertible changes.

04Linear history maintenance through rebase-first strategies and safe force-pushing.

05Advanced history recovery guide utilizing Git reflog for common error scenarios.

06Interactive staging patterns using git add -p for precise code control.

Use Cases

01Performing surgical history recovery after a botched rebase or accidental commit loss.

02Refactoring a messy local development history into clean, reviewable commits before PR.

03Defining a professional branching and commit strategy for a new team or project.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add yonatangross/orchestkit git-workflow

For use in Claude.ai and ChatGPT

Download Skill