skills.rest
HouseGarofalo
HouseGarofaloOFFICIAL
Explore all skills by this author →
GitHub

git-wizard-agent

Provides expert Git operations including bisect, worktree management, cherry-pick, and history rewriting.

3|1|Updated Feb 2, 2026
Search Tags:#git#version control#worktree#merge conflict#rebase#history rewriting#bisect
One-click install
npx skills add https://github.com/HouseGarofalo/claude-code-base --skill git-wizard-agent
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-wizard-agent
Source: https://github.com/HouseGarofalo/claude-code-base/tree/main/.claude/skills/git-wizard-agent
Command: npx skills add https://github.com/HouseGarofalo/claude-code-base --skill git-wizard-agent

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill empowers users to navigate and resolve complex Git operations, including intricate history manipulation, bug tracking with bisect, and efficient branching strategies, preventing data loss and streamlining development workflows.

Core Features & Use Cases

  • Advanced History Rewriting: Safely amend, squash, or reorder commits.
  • Bug Detection: Utilize git bisect to pinpoint the exact commit that introduced a bug.
  • Parallel Development: Manage multiple branches simultaneously with git worktree.
  • Conflict Resolution: Expert guidance on resolving merge conflicts effectively.
  • Use Case: You've accidentally committed sensitive information to your repository's history. This Skill can help you rewrite history to remove that commit safely.

Quick Start

Use the git-wizard-agent skill to help resolve a complex merge conflict in the 'feature-branch'.

Frequently Asked Questions about git-wizard-agent

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

FAQPage Schema
How do I resolve a complex merge conflict in Git?▼

To resolve a complex merge conflict, you need expert guidance on effectively identifying conflicting changes and applying the correct resolution strategy to streamline your development workflow.

How does git bisect work for finding bugs?▼

Git bisect works by performing a binary search through your commit history, using test passes and fails to pinpoint the exact commit that introduced a bug for accurate bug attribution.

What is the best way to remove sensitive data from Git history?▼

The best way to remove sensitive data is through advanced history rewriting, which safely amends or removes the problematic commits from your repository's history to prevent data exposure.

Can I manage multiple branches simultaneously with git worktree?▼

Yes, you can manage multiple branches simultaneously by using git worktree to enable parallel development, allowing you to check out and work on different branches in separate directories.

How do I safely squash or reorder commits with interactive rebase?▼

You can safely squash or reorder commits by using interactive rebase, which provides an expert-level interface for manipulating commit history to maintain a clean and logical project timeline.

Do I need deep Git knowledge to use interactive rebase and history rewriting?▼

Yes, performing advanced history rewriting and interactive rebase requires a deep understanding of Git's internal mechanisms and command-line interface to safely execute these complex operations.

Related Skills

Explore More Software Engineering Skills→
IAmKongHaiIAmKongHai

ce-clean-gone-branches

Remove local branches and worktrees deleted from the remote repository.

Community
Basic
ViewWayViewWay

Git

Enforce safe Git workflows with commit hygiene and branch policies.

Community
Advanced
irahardiantoirahardianto
150

parallel-dispatch-merge

Merge parallel worktree branches into main using DAG-derived ordering.

Community
Advanced
geoffjaygeoffjay
8

git-advanced

Guide interactive rebases, commit surgery, and history manipulation in Git.

Community
Advanced