blob: 7331fc59239849694d0c0b7013b8cea4f002e0a1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
---
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
|