Agent skill · software engineering · aiskillstore
git-advanced
Advanced Git operations and workflows including interactive rebasing, conflict resolution, history manipulation, bisecting for bugs, cherry-picking, reflog recovery, and branch management strategies. Use for: (1) Interactive rebasing and commit cleanup, (2) Complex merge conflict resolution, (3) Git bisect for bug hunting, (4) History rewriting and cleanup, (5) Branch strategy implementation (Git Flow, trunk-based), (6) Recovering lost commits with reflog
Why this skill is useful
Adds advanced Git commands and workflows for complex version control scenarios that the AI wouldn't reliably generate on its own.
What it needs
About 7k tokens when loaded. Last updated 2026-08-07. 405 stars on the source repository.
What this skill does
Advanced Git Operations Overview Master advanced Git workflows for complex version control scenarios. This skill covers sophisticated operations beyond basic commits and merges, including interactive rebasing, advanced conflict resolution, history manipulation, and strategic branch management. Use this skill when you need to: Clean up messy commit history before code review Resolve complex merge conflicts strategically Hunt down bugs with binary search (bisect) Recover lost commits or undo mistakes Implement team branching strategies Rewrite history safely Core Capabilities Interactive Rebasing Reorder commits for logical history Squash multiple commits into one Edit commit messages retroactively Split commits into smaller pieces Remove unwanted commits from history Conflict Resolution Strategic merge conflict handling Three-way merge understanding Ours vs theirs strategy selection Conflict marker interpretation Partial file staging during conflicts Git Bisect Binary search for bug introduction Automated bisect with scripts Good/bad commit identification Efficient debugging of regressions History Manipulation Amend commits safely Filter-branch operations BFG Repo-Cleaner for large files Rewrite history with caution Preserve attribution and dates Branch Strategies Git Flow workflow Trunk-based development Feature branch workflows Release branch management Hotfix procedures Quick Command Reference Interactive Rebase Conflict Resolution Git Bisect Cherry-Pick Reflog Recovery Core Workflows 1. …
How to use it
Reference it in AdaL, Claude Code, Cursor or any coding agent — nothing to install:
@skills aiskillstore/git-advanced