Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation.
SkillScore100Maintained
Automatic
◆Coding pack
Last verified 8/29/2026
What it changes
Passed 22 of 22 test cases with the skill, and 21 of 22 without it.
Without skill95%
With skill100%
Checks it passed that the model alone missed
Uses git reset HEAD^ to unstage the commit changes while preserving working directory files.
1 fixed21 passed either way0 still failing0 broke
Pass-rate lift
+5 pp
Tokens
+192%
Agent turns
0%
Response time
-17%
Model gemini-3.6-flashMeasured 8/29/2026v122 of 22 cases passed with skill
Tokens, turns and time describe resource use, not a dollar price.
See it in action
A test case the skill fixed. Same model, same prompt, with and without the skill.
Prompt
During an interactive rebase, I marked a commit with edit because it contains changes to both auth.js and db.js that I want to break into two separate commits. Now Git has stopped at that commit. What exact git reset command unstages the commit while keeping modified files intact in my working directory, and how do I complete the rebase after re-committing?
What was checked, without and with the skill
Checked
Without skill
With skill
Uses git reset HEAD^ to unstage the commit changes while preserving working directory files.
Missed
Passed
Uses git rebase --continue after creating the replacement commits.
Passed
Passed
case-07 · gemini-3.6-flash · 8/29/2026 · answers are capped and redacted
What's inside
The instructions your model reads when the skill loads.
SKILL.md400 linessingle file
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:
# Rebase last 5 commits
git rebase -i HEAD~5
# Rebase all commits on current branch
git rebase -i $(git merge-base HEAD main)
# Rebase onto specific commit