---
name: git
description: Git version control workflows, branching strategies, and commit best practices.
---

# Git Skill

## When to use
- Managing git repositories
- Creating branches and merging
- Writing commit messages
- Resolving merge conflicts

## Best practices
- Write clear, descriptive commit messages
- Use conventional commits format (feat:, fix:, docs:, etc.)
- Keep commits atomic and focused
- Use feature branches for new work
- Rebase before merging to keep history clean

## Common commands
```bash
# Status and diff
git status
git diff

# Branching
git checkout -b feature/my-feature
git merge main

# Commit
git add -p
git commit -m "feat: add new feature"
```
