Source Control

ABOUTME: Git conventional commit format and version control best practices

ABOUTME: Commit message standards, branch strategies, workflow patterns

Source Control

Quick Reference

git commit -m "feat: add user authentication"
git checkout -b feat/user-auth
git fetch origin && git rebase origin/main
git stash && git stash pop

---

Conventional Commits

Format: (): (scope/body/footer optional)

| Type | Use | |------|-----| | feat | New feature | | fix | Bug fix | | docs | Documentation | | style | Formatting | | refactor | Code restructure | | perf | Performance | | test | Tests | | chore | Maintenance | | ci | CI/CD | | build | Build system | | revert | Revert commit |

Rules: Imperative mood, present tense, lowercase, no period, max 50 chars

# Good
git commit -m "feat(auth): add JWT validation"
git commit -m "fix: resolve race condition"

# Bad
git commit -m "Fixed stuff"      # Not conventional
git commit -m "Feat: Add thing"  # Capital letter

---

Commit Process

1. Check state:

``bash git status && git diff HEAD && git branch --show-current && git log --oneline -5 ``

1. Verify NOT on main/master (abort if so, unless authorized)

1. Stage specific files (never git add -A):

``bash git add ``

1. Commit with conventional format:

``bash git commit -m "(): " ``

---

Branch Naming

| Type | Pattern | |------|---------| | Feature | feat/user-auth, feature/dashboard | | Fix | fix/login-bug, bugfix/api-error | | Hotfix | hotfix/security-patch | | Chore | chore/update-deps |

---

Workflow

# Start feature
git checkout main && git pull origin main
git checkout -b feat/user-auth

# Keep up to date
git fetch origin && git rebase origin/main

# After PR merged
git checkout main && git pull
git branch -d feat/user-auth

| Use | When | |-----|------| | Rebase | Keep feature branch current, clean linear history | | Merge | Integrate to main (via PR), preserve history |

---

Rules

• NEVER push automatically (Max pushes manually)
• NEVER work on main/master unless explicitly authorized
• Small, logical commits; no huge unrelated changes
• --force-with-lease, never bare --force on shared branches
• Run make check && make test-e2e before committing (see language skills for the expansion)
• Conflict resolution and recovery commands (reset, reflog, revert, amend): use standard git, no project-specific conventions here.

Source & license

This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.

• Author: maroffo
• Source: maroffo/claude-forge
• License: MIT

Install and usage instructions live in the source repository linked above.