git-expert

Guide advanced Git operations with safety checks for history rewrites.

3|2|Updated Feb 27, 2026

Search Tags:#git #branching #reflog #version-control #conflicts #history-rewrite

Ready to run

npx skills add https://github.com/grasberg/sofia --skill git-expert-grasberg

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-expert
Source: https://github.com/grasberg/sofia/tree/main/workspace/skills/git-expert
Command: npx skills add https://github.com/grasberg/sofia --skill git-expert-grasberg

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Advanced git operations often require careful coordination, safety nets, and precise history management to avoid breaking shared work or losing data.

Core Features & Use Cases

Interactive rebase, bisect, and cherry-pick with safety reminders and best practices.
Reflog-based recovery, conflict resolution, and stash/worktree workflows for complex histories.
Monorepo-friendly patterns and structured history rewrites with guardrails.

Quick Start

Ask the Git Expert to guide you through an interactive rebase on your feature branch.

Frequently Asked Questions about git-expert

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

FAQPage Schema

How do I safely perform an interactive rebase without losing commits?▼

Resolve Git merge conflicts during feature integration using structured stash and worktree workflows. This approach manages complex histories safely by applying guided conflict resolution techniques without overwriting uncommitted changes in your working directory.

Can I recover lost commits after a failed history rewrite or hard reset?▼

You can recover lost commits after a failed history rewrite using reflog-based recovery techniques. The reflog tracks reference updates, allowing you to identify and restore previous branch states even after destructive operations like hard resets or force pushes.

What is the best way to backport a bugfix to an older release branch?▼

The best way to backport a bugfix to an older release branch is using cherry-pick with safety reminders. This guided workflow applies specific commits from your main branch while maintaining history integrity and avoiding unintended merge conflicts.

Does interactive rebase work safely in large repositories with multiple remotes?▼

Interactive rebase works safely in large repositories with multiple remotes when using monorepo-friendly patterns and guardrails. The process avoids force-push on shared branches and applies structured history rewrites to maintain integration stability across all remotes.

Why should I avoid force-push on shared branches during history rewrites?▼

You should avoid force-push on shared branches during history rewrites because it overwrites remote history and breaks coordination for other contributors. Enforcing safety checks prevents breaking shared work by requiring backup branches before applying any structural changes.