---

name: git-workflow description: Git branch, commit, and PR management. Use for version control operations and maintaining clean git history.

Git Workflow Skill

Maintain clean git history with consistent conventions.

Branch Naming

Format

Copy<type>/<slug>

Types

Slug Rules

• kebab-case
• Max 50 characters
• Include ticket ID if available

Examples

Copyfeat/add-user-auth
fix/null-pointer-login
feat/ABC-123-payment-flow
refactor/extract-validation

Commit Messages

Format

Copy<type>(<scope>): <summary>

[optional body]

[optional footer]

Types

Rules

• Imperative mood ("add" not "added")
• Lowercase first letter
• No period at end
• Max 50 chars for summary
• Body wraps at 72 chars

Examples

Copyfeat(auth): add JWT token validation

fix(api): handle null response from service

refactor(db): extract query builder

test(users): add creation edge cases

chore(deps): update ruff to v0.8

Common Operations

Start Feature

Copygit checkout main
git pull --ff-only
git checkout -b feat/my-feature

Save Progress

Copygit add -p  # Interactive staging
git commit -m "feat(scope): description"

Update from Main

Copygit fetch origin main
git rebase origin/main

Clean Up Commits

Copygit rebase -i origin/main
# squash fixups, reword messages

Push & PR

Copygit push -u origin feat/my-feature
gh pr create --fill

PR Description

Copy## Summary
- Key change 1
- Key change 2

## Motivation
Why this change exists

## Changes
### Area 1
- Detail

## How to Test
1. Step 1
2. Step 2

## Risk
- Level: Low/Medium/High
- Notes: [any concerns]