---
name: git
description: "Inspect status/diff/history, preserve user work, create focused commits when requested, help with merges/rebases/conflicts."
---

# Git Skill

Inspect status/diff/history, preserve user work, create focused commits when requested, help with merges/rebases/conflicts.

## Operations

### Inspect
- `git status` - working tree state
- `git diff` - unstaged changes
- `git diff --cached` - staged changes
- `git log --oneline -20` - recent history

### Preserve
- Never discard user changes
- Stash before risky operations
- Backup before rewrites

### Commit
- One logical change per commit
- Clear, imperative messages
- Reference issues when applicable
- Use strict commit message formats

### Merge
- Prefer merge with commits
- Resolve conflicts incrementally