New: 97,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Git Mastery

by softspark in softspark/ai-toolkit

Advanced Git: rebase, bisect, reflog, cherry-pick, worktrees, LFS.

Apache-2.0Auto-check passedDevelopment

Install Git Mastery

skills CLI
$ npx skills add softspark/ai-toolkit --skill git-mastery -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install softspark/ai-toolkit git-mastery --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/softspark/ai-toolkit.git skills-src && mkdir -p .claude/skills && cp -r skills-src/app/skills/git-mastery .claude/skills/git-mastery && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
git-mastery
GitHub stars
179
Token cost
~1.3k tokens
SKILL.md length
593 words
Files
1
Skills in repo
112
Repo updated
First seen
Licence
Apache-2.0

At a glance

Advanced Git: rebase, bisect, reflog, cherry-pick, worktrees, LFS.

  • Works in 5 steps: Automated Bug Hunting (Git Bisect) → Interactive Interactive Rebase → Log Analysis → …
  • Tasks that involve Git workflow
  • SKILL.md covers 🛡️ Safety First Protocol, Advanced Workflows, Commit Message Standard… and Common Rationalizations, plus 3 more sections
  • Calls git and pip

What it does

Git Mastery is an agent skill from softspark/ai-toolkit. Advanced Git: rebase, bisect, reflog, cherry-pick, worktrees, LFS. Triggers: rebase, bisect, cherry-pick, reflog, force push, merge conflict, worktree.

Its SKILL.md is about 1.3k tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow and Git worktrees. It works with Git. The repository describes itself as: Professional-grade AI coding toolkit: 94 skills, 44 agents, multi-platform (Claude, Cursor, Windsurf, Copilot, Gemini, Cline, Roo Code, Aider, Augment, Antigravity, Codex CLI… The licence is Apache-2.0.

When your agent uses it

  • Tasks that involve Git workflow
  • Tasks that involve Git worktrees

Example prompts

  • “/git-mastery”

Requirements

  • Python 3
  • Pre-approved tools (allowed-tools): Read, Grep, Glob

Workflow steps

5 steps, taken from the step headings in SKILL.md.

  1. Automated Bug Hunting (Git Bisect)
  2. Interactive Interactive Rebase
  3. Log Analysis
  4. Recovery (Reflog)
  5. Cherry Picking

What it can do on your machine

Read from SKILL.md and the folder at commit d64db2b. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves these tools, so the agent can use them without asking each time:

    • Read
    • Grep
    • Glob

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git
    • pip

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git and pip, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Git Mastery loads about 1.3k tokens when it runs. Until then it costs about 41 tokens; SKILL.md has 593 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~41
When it runs · the whole SKILL.md, loaded when a task matches
~1.3k

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from softspark/ai-toolkit at commit d64db2b, republished under its Apache-2.0 licence (© softspark). 593 words, ~1,266 tokens.

Download SKILL.mdSave it as .claude/skills/git-mastery/SKILL.md (or your agent's skills folder).
name
git-mastery
description
Advanced Git: rebase, bisect, reflog, cherry-pick, worktrees, LFS. Triggers: rebase, bisect, cherry-pick, reflog, force push, merge conflict, worktree.
allowed-tools
Read, Grep, Glob
effort
medium
user-invocable
false

Git Mastery Skill

🛡️ Safety First Protocol

  • Never force push to main / master / develop.
  • Always use --force-with-lease instead of --force.
  • Always create a backup branch before complex operations: git branch backup/feature-xyz-pre-rebase

Advanced Workflows

1. Automated Bug Hunting (Git Bisect)

Find the specific commit that introduced a bug.

bash
# Start
git bisect start
git bisect bad              # Current version is broken
git bisect good <commit-sha> # Version that worked

# Automate with test script
git bisect run pytest tests/test_failing_feature.py
2. Interactive Interactive Rebase

Clean up commit history before merge.

bash
git rebase -i HEAD~n
  • squash: Combine commits.
  • reword: Fix messages.
  • dropped: Remove junk commits.
3. Log Analysis

Visualize branch topology.

bash
git log --graph --oneline --decorate --all
4. Recovery (Reflog)

Recover "lost" commits after a bad reset/rebase.

bash
git reflog
git reset --hard HEAD@{n}
5. Cherry Picking

Pick specific commits from other branches.

bash
git cherry-pick <commit-sha>
# If valid conflict
git add .
git cherry-pick --continue

Commit Message Standard (Conventional Commits)

  • feat: New feature
  • fix: Bug fix
  • docs: Documentation only
  • style: Formatting (white-space, etc)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Performance improvement
  • test: Adding missing tests
  • chore: Build process/auxiliary tools

Common Rationalizations

ExcuseWhy It's Wrong
"I'll clean up commits later"Later means never — write clean commits as you go
"Force push is fine on my branch"Others may have fetched your branch — use --force-with-lease
"One big commit is simpler"Big commits are impossible to review, bisect, or revert — keep them atomic
"Merge conflicts mean someone else's problem"Conflicts mean you diverged too long — rebase frequently to stay aligned
"Commit messages don't matter"Messages are documentation — future you needs to understand why, not just what

Rules

  • MUST use --force-with-lease instead of --force for any force operation on a shared branch
  • MUST create a backup branch before interactive rebase, reset --hard, or filter-repo: git branch backup/<name>-pre-rebase
  • NEVER force-push to main, master, or develop — these are shared trunk branches by convention
  • NEVER rewrite history that has already been pushed AND consumed by others — you will orphan their clones
  • CRITICAL: the reflog is a 90-day safety net (gc.reflogExpire) — tag anything you want to keep longer. Do not rely on reflog for multi-month recovery.
  • MANDATORY: commit messages follow Conventional Commits (feat:, fix:, docs:, refactor:, test:, chore:) — drift defeats automated changelog and release tooling
Show full SKILL.md (272 more words)Show less

Gotchas

  • git bisect relies on each commit being testable. Flaky tests corrupt the bisection silently — a flaky "bad" mark sends bisect down the wrong half. Run the test 3× at the boundary commits if flakiness is known.
  • git cherry-pick <sha> of a merge commit fails without --mainline 1 (or 2). The error is cryptic ("commit is a merge but no -m option was given"); the fix is simple but non-obvious.
  • git reflog entries expire by default in 90 days (gc.reflogExpire) and unreferenced commits get garbage-collected after 30 days (gc.reflogExpireUnreachable). Long-term recovery of "lost" commits from reflog is not guaranteed.
  • git rebase -i --root is supposed to include the very first commit, but on shallow clones (--depth N) the "root" is the shallow boundary, not the actual initial commit. Run git fetch --unshallow before rebasing --root.
  • git filter-branch is deprecated and slow (shell-based, re-forks per commit). Use git filter-repo for history rewriting — it is a separate tool (pip install git-filter-repo) but 100× faster and endorsed by the Git maintainers.
  • git pull --rebase on a branch with unpushed merge commits rewrites those merges into linear history, silently losing the merge metadata. If a merge was intentional (e.g., to preserve feature-branch context), use git pull --no-rebase or set pull.ff=only globally.

When NOT to Load

  • For simple commits on a ready branch — use /commit
  • For opening a PR after commits are clean — use /pr
  • For a specific failed operation needing root-cause analysis — use /debug on the git output
  • For CI-specific git behavior (shallow clones, LFS on runners) — use /ci-cd-patterns
  • For the in-repo .git/hooks/* content — this skill is user-facing Git; hook mechanics live in /hook-creator and install_git_hooks.py

© softspark, Apache-2.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in app/skills/git-mastery of softspark/ai-toolkit.

Open the folder on GitHubat commit d64db2b

Compare with similar skills

Git Mastery next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Git Mastery compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Git Mastery this skillsoftspark/ai-toolkit179—~1.3kAutomated safety check: PassApache-2.0
Finishing a Development Branchobra/superpowers296k5 repos~1.9kAutomated safety check: PassMIT
Git Worktree Cleanuplobehub/lobehub83k—~2.8kAutomated safety check: PassCustom licence
Ccmanager Configkbwo/ccmanager1.3k—~1.5kAutomated safety check: PassMIT
Git Worktree Managermicrosoft/WindowsAppSDK4.7k—~2kAutomated safety check: PassMIT
Git Worktree IsolationjnMetaCode/superpowers-zh8.3k1 repos~982Automated safety check: PassMIT

Similar skills

  • Finishing a Development Branch

    obra/superpowers

    Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    296k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • Git Worktree Cleanup

    lobehub/lobehub

    Audits stale Git worktrees and branches with a bundled script, classifies each one, and deletes only after you approve the exact candidates.

    83k GitHub stars~2.8k tokensUpdated today
    DevelopmentAuto-check passed

  • Ccmanager Config

    kbwo/ccmanager

    Set up, review, or repair a CCManager config — .ccmanager.json at a git repository root, or the global ~/.config/ccmanager/config.json.

    1.3k GitHub stars~1.5k tokensUpdated 10 days ago
    DevelopmentAuto-check passed

  • Git Worktree Manager

    microsoft/WindowsAppSDK

    Official

    Creates and manages Git worktrees with PowerShell scripts so separate issues and Copilot sessions each get an isolated branch, build and test environment.

    4.7k GitHub stars~2k tokensUpdated today
    DevelopmentAuto-check passed

  • Git Worktree Isolation

    jnMetaCode/superpowers-zh

    Sets up an isolated workspace before feature work or plan execution, preferring native worktree tools and falling back to git worktree, with instructions in Chinese.

    8.3k GitHub starsUsed in 1 repo~982 tokens
    DevelopmentAuto-check passed

  • Git Commit

    tisfeng/Easydict

    起草、创建或汇报 Angular-style 本地 Git 提交。用于明确的提交交付；分支集成使用 worktree-rebase-merge，不 push。

    15k GitHub stars~535 tokensUpdated yesterday
    DevelopmentAuto-check passed

More from softspark/ai-toolkit

All 112 skills in this repo

  • Prepare Test Env

    softspark/ai-toolkit

    Prepare or verify a project QA environment with source identity, readiness, browser access, evidence paths and owned cleanup.

    179 GitHub stars~1.8k tokensUpdated today
    Auto-check: notes

  • A11y Validate

    softspark/ai-toolkit

    Accessibility validator: WCAG 2.1 AA, EN 301 549, EAA. An agent skill from softspark/ai-toolkit.

    179 GitHub stars~3.8k tokensUpdated today
    Auto-check: notes

  • Analyze

    softspark/ai-toolkit

    Analyzes code quality, complexity, patterns across codebase.

    179 GitHub stars~1k tokensUpdated today
    Auto-check passed

  • Autonomous Dev

    softspark/ai-toolkit

    Drives a brief, specification, issue or existing PR through implementation, review, tests and QA to a ready PR.

    179 GitHub stars~2.6k tokensUpdated today
    Auto-check: notes

  • Brand Voice

    softspark/ai-toolkit

    Direct technical voice for docs, README, user-facing text. An agent skill from softspark/ai-toolkit.

    179 GitHub stars~2.1k tokensUpdated today
    Auto-check passed

  • CI

    softspark/ai-toolkit

    Detect/generate/debug CI pipeline config (GitHub Actions, GitLab CI).

    179 GitHub stars~1.1k tokensUpdated today
    Auto-check: notes

Works with

Categories

Questions about Git Mastery

What does Git Mastery do?

Advanced Git: rebase, bisect, reflog, cherry-pick, worktrees, LFS. Git Mastery is an agent skill from softspark/ai-toolkit. Advanced Git: rebase, bisect, reflog, cherry-pick, worktrees, LFS.

When should I use Git Mastery?

Git Mastery fits situations like: tasks that involve Git workflow; tasks that involve Git worktrees.

How do I install Git Mastery in Claude Code?

Run `npx skills add softspark/ai-toolkit --skill git-mastery -a claude-code`. Or copy the skill folder (app/skills/git-mastery in softspark/ai-toolkit) into .claude/skills/git-mastery in your project. Claude Code loads it when a task matches its description.

How do I install Git Mastery in Codex?

Run `npx skills add softspark/ai-toolkit --skill git-mastery -a codex`. Or copy the skill folder (app/skills/git-mastery in softspark/ai-toolkit) into .agents/skills/git-mastery in your project. Codex loads it when a task matches its description.

Can I use Git Mastery in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add softspark/ai-toolkit --skill git-mastery -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/git-mastery, .gemini/skills/git-mastery, .github/skills/git-mastery and .opencode/skills/git-mastery in your project.

What does Git Mastery need to run?

Going by SKILL.md and its folder, Git Mastery needs the command-line tools its instructions call (git and pip). Our summary lists: Python 3. Its frontmatter pre-approves these tools: Read, Grep, Glob.

Does Git Mastery access the network?

SKILL.md contains no URLs. Its commands use git and pip, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Git Mastery safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Git Mastery use?

Git Mastery is published under the Apache-2.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Git Mastery use?

About 1.3k tokens (SKILL.md is roughly 5.1k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Git Mastery?

Skills that share tags, products or a category with Git Mastery: Finishing a Development Branch (obra/superpowers, 296k stars), Git Worktree Cleanup (lobehub/lobehub, 83k stars), Ccmanager Config (kbwo/ccmanager, 1.3k stars) and Git Worktree Manager (microsoft/WindowsAppSDK, 4.7k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Git Mastery?

softspark (a GitHub user) maintains it in softspark/ai-toolkit, which has 179 GitHub stars. The repository holds 112 skills in this directory. The repository was last updated on October 7, 2026.

Source: softspark/ai-toolkit on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.