git-master

name	git-master
description	Provides expert Git operations with safety guardrails, conflict resolution, and best practices. Use when user asks to commit, push, merge, rebase, or fix git issues.
license	Apache-2.0
metadata	{"version":"1.0.0","language":"en","trit":-1,"author":"agent-builder"}

Git Master

Expert Git operations with built-in safety rails and best practices.

🚀 Self-Deployment & Bootstrapping

If this skill's Git workflows are not appearing in your agent's slash-commands, run the following command from the skill's root directory: python scripts/bootstrap.py --workspace .

This will automatically detect your agent's configuration directory (e.g., .agents, .cursor, .gemini, or .agent) and deploy the necessary .md or .mdc files.

🚨 CRITICAL RULES

1. Safety First: Before ANY destructive operation (reset --hard, force push, filter-repo), you MUST:
   • Explicitly warn the user.
   • Offer to create a backup branch.
   • Ask for confirmation.
2. User Preference: At the start of a task, ask: "Do you want automatic commits or manual control?"
3. Cross-platform Paths: Use forward slashes (/) in examples for cross-platform compatibility. Windows git handles forward slashes correctly.

📚 References

Load these specific references based on the valid user task:

Topic	Reference File
Basics	references/basic-operations.md
Branch/Merge	references/branching-merging.md
Remotes	references/remote-operations.md
Advanced	references/advanced-operations.md
Platforms	references/platform-guide.md

🛠️ Quick Reference

Safety Check Pattern

# Before dangerous ops
git status
git branch backup-$(date +%Y%m%d-%H%M%S)
# Proceed only after confirmation

Most Common Operations

Status & Log

git status
git log --oneline --graph --all

Undo Last Commit (Keep Changes)

git reset --soft HEAD~1

Emergency Recovery

git reflog
# Find the hash before the mistake, then:
# git reset --hard <hash> (if local)
# git cherry-pick <hash> (to recover specific commit)

🔍 When to Use

• Repository Setup: Init, clone, config.
• Daily Work: Commit, push, pull, branch, merge.
• Fixing Issues: Conflicts, detached HEAD, wrong branch.
• Advanced: Interactive rebase, stash, submodules, worktrees.
• Disaster Recovery: Reflog, fsck, filter-repo.