What branching strategies are supported?

It includes templates and implementation guidance for popular workflows like Git Flow (scheduled releases) and Trunk-based development (continuous deployment).

Can this skill help me recover code I deleted with a hard reset?

Yes, it provides specific workflows using Git reflog to identify and restore lost commits even after destructive hard resets or branch deletions.

Is it safe to rewrite history using these tools?

The skill emphasizes safety best practices, such as creating backup branches and using --force-with-lease, to ensure history rewrites are performed safely without disrupting team collaboration.

How does Git bisect work within this skill?

The skill guides you through the binary search process, marking 'good' and 'bad' commits to isolate the exact source of a bug, and can automate the search using custom test scripts.

Advanced Git Operations

Name: Advanced Git Operations
Author: icartsh

byicartsh

0•

Deployment & DevOps

Master sophisticated version control tasks including interactive rebasing, conflict resolution, and history recovery.

Advanced Git Operations is a specialized Claude Code skill designed to streamline complex version control workflows and repository maintenance. It empowers developers to handle interactive rebasing for commit cleanup, resolve intricate merge conflicts with strategic accuracy, and utilize binary search debugging via Git bisect. Whether you need to recover lost commits using the reflog, implement robust branching strategies like Git Flow, or perform safe history rewrites, this skill provides the domain-specific guidance and automated command sequences necessary to maintain a professional codebase.

Key Features

01Interactive rebasing for commit squashing, reordering, and history cleanup

02Automated bug hunting with Git bisect and integrated test scripts

03Strategic conflict resolution using ours/theirs logic and three-way merges

04Emergency recovery of lost commits and branches using Git reflog

050 GitHub stars

06Implementation patterns for Git Flow and Trunk-based development strategies

Use Cases

01Identifying the specific commit that introduced a regression in a large codebase

02Recovering a deleted feature branch or undoing a destructive 'reset --hard' command

03Cleaning up messy local commit history and 'WIP' messages before code reviews

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add icartsh/icartsh_plugin git-advanced

For use in Claude.ai and ChatGPT

Download Skill