Can I use this for partial staging and commits?

Yes, it includes detailed instructions for interactive staging (git add -p) allowing you to stage and commit specific hunks of code rather than entire files.

Can this skill help me remove sensitive files from my Git history?

Yes, it provides comprehensive guidance on using tools like git-filter-repo and BFG Repo-Cleaner to permanently remove files, passwords, and large blobs from your repository history.

Does it support interactive rebasing operations?

Absolutely. The skill covers squashing, fixing up, reordering, and splitting commits, as well as using the --autosquash workflow for efficient history management.

How does it handle complex merge conflicts?

The skill offers advanced strategies like Rerere (Reuse Recorded Resolution) to automate repeat conflict resolution, as well as specific strategies like 'ours', 'theirs', and 'patience' algorithms.

Advanced Git Operations

Name: Advanced Git Operations
Author: geoffjay

bygeoffjay

•

Developer Tools

Performs complex Git tasks including history manipulation, interactive rebasing, and sophisticated conflict resolution.

About

This skill empowers Claude with expert-level Git knowledge for managing complex repository states and history. It provides specialized guidance on interactive rebasing, splitting and squashing commits, rewriting history to remove sensitive files, and applying advanced merge strategies. Whether you need to perform 'commit surgery' on a messy branch or navigate complex merge conflicts using Rerere and custom merge tools, this skill ensures precise version control management for experienced developers working in high-stakes environments.

Key Features

2 GitHub stars
Granular interactive staging and partial file commits using patches
Interactive rebase strategies including squash, fixup, reorder, and split
Repository cleanup and sensitive data removal using filter-repo and BFG
Sophisticated merge strategies and conflict resolution with Rerere
Advanced history manipulation and commit surgery techniques

Use Cases

Cleaning up messy feature branch history before submitting a pull request
Resolving recurring complex merge conflicts across highly divergent branches
Removing accidentally committed secrets or large binary files from entire git history

About

Key Features

2 GitHub stars
Granular interactive staging and partial file commits using patches
Interactive rebase strategies including squash, fixup, reorder, and split
Repository cleanup and sensitive data removal using filter-repo and BFG
Sophisticated merge strategies and conflict resolution with Rerere
Advanced history manipulation and commit surgery techniques

Use Cases

Cleaning up messy feature branch history before submitting a pull request
Resolving recurring complex merge conflicts across highly divergent branches
Removing accidentally committed secrets or large binary files from entire git history