Agent skill · software engineering · aiskillstore
git-advanced-workflows
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
Why this skill is useful
Provides specific commands and workflows for advanced Git techniques that the AI wouldn't reliably generate on its own.
What it needs
About 6k tokens when loaded. Last updated 2026-08-07. 405 stars on the source repository.
What this skill does
Git Advanced Workflows Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence. When to Use This Skill Cleaning up commit history before merging Applying specific commits across branches Finding commits that introduced bugs Working on multiple features simultaneously Recovering from Git mistakes or lost commits Managing complex branch workflows Preparing clean PRs for review Synchronizing diverged branches Core Concepts 1. Interactive Rebase Interactive rebase is the Swiss Army knife of Git history editing. Common Operations: pick: Keep commit as-is reword: Change commit message edit: Amend commit content squash: Combine with previous commit fixup: Like squash but discard message drop: Remove commit entirely Basic Usage: 2. Cherry-Picking Apply specific commits from one branch to another without merging entire branches. 3. Git Bisect Binary search through commit history to find the commit that introduced a bug. Automated Bisect: 4. Worktrees Work on multiple branches simultaneously without stashing or switching. 5. Reflog Your safety net - tracks all ref movements, even deleted commits. Practical Workflows Workflow 1: Clean Up Feature Branch Before PR Workflow 2: Apply Hotfix to Multiple Releases Workflow 3: Find Bug Introduction Workflow 4: Multi-Branch Development Workflow 5: Recover from Mistakes Advanced Techniques Rebase vs Merge Strategy When to Rebase: Cleaning up local commits before pushing Keeping feature branch up-to-date with main Creating linear history for easier review When to Merge: Integrating completed features into main Preserving exact history of collaboration Public branches used by others Autosquash Workflow Automatically squash fixup commits during rebase. Split Commit Break one commit into multiple logical commits. Partial Cherry-Pick Cherry-pick only specific files from a commit. Best Practices 1. …
How to use it
Reference it in AdaL, Claude Code, Cursor or any coding agent — nothing to install:
@skills aiskillstore/git-advanced-workflows--78e0a0