git-advanced

Provides advanced Git guidance for rebasing, cherry-picking, and recovering lost commits.

Updated Jan 29, 2026
One-click install
npx skills add https://github.com/nilpath/nilpath-marketplace --skill git-advanced-nilpath
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-advanced
Source: https://github.com/nilpath/nilpath-marketplace/tree/main/plugins/claude-code-tools/skills/git-advanced
Command: npx skills add https://github.com/nilpath/nilpath-marketplace --skill git-advanced-nilpath

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

Advanced guidance for complex Git operations, recovery, and command references, enabling you to handle rebases, cherry-picks, reflogs, stash, resets, bisect, and more with confidence.

Core Features & Use Cases

  • Comprehensive operation coverage: rebase, cherry-pick, revert, reflog, stash, reset, clean, bisect, amend, and more across local and collaborative workflows.
  • Recovery & safety guidance: best practices for undoing changes, recovering lost commits, and avoiding destructive actions on shared branches.
  • Reference-driven learning: includes quick command references and deep dives to support quick lookups during development.

Quick Start

Run a sample scenario: revert a mistaken commit safely by inspecting history and applying a targeted reset or revert.

Frequently Asked Questions about git-advanced

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I recover a lost commit in Git after a hard reset?

To recover a lost commit in Git, you use the reflog to find the hash of the detached HEAD and reset your branch back to that state. This Skill provides reference guides for navigating history rewriting and undoing destructive actions safely.

What is the safest way to undo a mistaken commit on a shared branch?

The safest way to undo a mistaken commit on a shared branch is using git revert instead of a destructive reset. This Skill outlines recovery workflows and best practices to avoid rewriting shared history while correcting mistakes.

How do I resolve complex conflicts during an interactive rebase?

Resolving conflicts during an interactive rebase involves staging fixed files and continuing the sequence. This Skill provides step-by-step command references for handling complex conflict resolution across multiple branches.

When should I use cherry-pick instead of merge in Git?

You should use cherry-pick to apply a specific commit from another branch without merging entire histories. This Skill covers advanced operations like cherry-picking across local and collaborative workflows to manage targeted changes.

How does git bisect help find the commit that introduced a bug?

Git bisect helps find a bug-introducing commit by performing a binary search through your commit history using good and bad markers. This Skill includes deep dives on using bisect and other advanced diagnostic commands.

Can I safely clean untracked files and directories from my working directory?

You can safely clean untracked files using git clean with dry-run flags before execution. This Skill offers reference-driven guidance on stash, clean, and reset operations to manage your working directory confidently.