AgentSkillsCN

git-master

提供专业的 Git 操作服务，配备安全防护措施、冲突解决机制与最佳实践。适用于用户请求提交、推送、合并、变基，或修复 Git 问题时使用。

SKILL.md
--- frontmatter
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"
  trit: -1
  author: agent-builder

Git Master

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

🚨 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:

TopicReference File
Basicsreferences/basic-operations.md
Branch/Mergereferences/branching-merging.md
Remotesreferences/remote-operations.md
Advancedreferences/advanced-operations.md
Platformsreferences/platform-guide.md

🛠️ Quick Reference

Safety Check Pattern

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

Most Common Operations

Status & Log

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

Undo Last Commit (Keep Changes)

bash
git reset --soft HEAD~1

Emergency Recovery

bash
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.