1. Modern Git Commands
Location: skills/modern-git/
Purpose: Teaches AI agents to use modern, intuitive Git commands introduced in Git 2.23+ instead of legacy multi-purpose commands.
Key Principles:
- Use
git switch for branch operations (NOT git checkout) - Use
git restore for file operations (NOT git checkout --) - Use
git push --force-with-lease (NOT git push --force) - Be explicit about intent to prevent mistakes
Quick Example:
```bash
# β Legacy (unclear, error-prone)
git checkout main
git checkout -b feature
git checkout -- src/app.js
# β Modern (clear, safe)
git switch main
git switch -c feature
git restore src/app.js
```
Documentation:
- [SKILL.md](skills/modern-git/SKILL.md) - Quick reference and common workflows
- [Command Comparison](skills/modern-git/references/command-comparison.md) - Detailed side-by-side comparisons
- [Migration Guide](skills/modern-git/references/migration-guide.md) - Complex scenarios and patterns
---
2. Git Commit Best Practices
Location: skills/git-commits/
Purpose: Teaches AI agents to create high-quality commits with clear messages, proper granularity, and effective use of the staging area.
Key Principles:
- Atomic Commits - One logical change per commit
- Conventional Commits - Standardized message format (feat, fix, docs, etc.)
- Clear Messages - Explain why, not just what
- Smart Staging - Use
git add -p for partial staging
Quick Example:
```bash
# β Good: Atomic commits with clear messages
git add src/auth.js src/api.js
git commit -m "feat(auth): add JWT token refresh mechanism
Implements automatic token refresh 5 minutes before expiration.
Prevents user session interruption during active usage.
Closes #234"
# β Bad: Everything in one vague commit
git add .
git commit -m "update auth stuff"
```
Documentation:
- [SKILL.md](skills/git-commits/SKILL.md) - Complete guide to commit best practices
- [Conventional Commits](skills/git-commits/references/conventional-commits.md) - Deep dive into commit message format
---
3. Git Collaboration Workflows
Location: skills/git-collaboration/
Purpose: Teaches AI agents to collaborate effectively in team environments using Git, including PR workflows, merge strategies, and conflict resolution.
Key Principles:
- Feature Branch Workflow - Standard collaboration pattern
- Small, Focused PRs - Easier to review and merge
- Rebase for Clean History - Linear, readable commit history
- Review-Friendly - Structure changes for easy review
Quick Example:
```bash
# β Standard feature workflow
git switch main
git pull
git switch -c feature/add-notifications
# Work and commit
git add src/notifications.js
git commit -m "feat(notifications): add email notification service"
# Stay up to date
git fetch origin
git rebase origin/main
# Create PR
git push -u origin feature/add-notifications
gh pr create --title "Add notification system"
# After merge, cleanup
git switch main
git pull
git branch -d feature/add-notifications
```
Documentation:
- [SKILL.md](skills/git-collaboration/SKILL.md) - PR workflows and collaboration patterns
---
4. Git Safety and Recovery
Location: skills/git-recovery/
Purpose: Teaches AI agents to work safely with Git and recover from common mistakes without losing work.
Key Principles:
- Git Rarely Deletes - Almost everything is recoverable via reflog
- Understand Before Destroying - Know what
--hard, --force do - Backup Before Risky Operations - Use stash, branches, or tags
- Revert, Don't Reset - For shared branches
Quick Example:
```bash
# β Mistake: Deleted important branch
git branch -D feature/import
|