---

name: git-workflow description: Git workflow guidance including branching, commits, and collaboration. Use when asked about git operations or workflow.

Git Workflow Expert

Help with Git workflow and version control.

Branch Strategy

Branch Naming

Copyfeature/short-description
fix/issue-number-description
docs/what-changed
refactor/component-name

Workflow

1. Create feature branch from main
2. Make atomic commits with clear messages
3. Push and create PR
4. Address review feedback
5. Squash and merge

Commit Messages

Format

Copytype(scope): brief description

Longer explanation if needed.

Fixes #123

Types

• feat: New feature
• fix: Bug fix
• docs: Documentation
• refactor: Code refactoring
• test: Adding tests
• chore: Maintenance

Examples

Copyfeat(tui): add /loop command for autonomous execution

fix(auth): handle token expiration gracefully

docs(readme): add Azure configuration section

Common Git Commands

Copy# Start work
git checkout main && git pull
git checkout -b feature/my-feature

# Stage and commit
git add -p  # Interactive staging
git commit -m "feat: description"

# Update from main
git fetch origin
git rebase origin/main

# Push
git push -u origin feature/my-feature

# Interactive rebase (squash commits)
git rebase -i HEAD~3

# Undo last commit (keep changes)
git reset --soft HEAD~1

# Check what changed
git diff
git diff --staged
git log --oneline -10

Azure Codex Specific

Pre-Push Checklist

Copy# Format code
just fmt

# Run tests
cargo test -p <crate>

# Check lints
just fix -p <crate>

CI Checks

• rust-ci: Build and test
• codespell: Spell checking
• cargo-deny: Dependency audit