Git Workflow

This is a comprehensive Git reference that consolidates the patterns you'd otherwise repeat across multiple Claude Code agents. It covers conventional commits, branching strategies like Git Flow and trunk-based development, conflict resolution, interactive rebasing, and debugging tools like bisect and blame. The real value is in eliminating 120-150 lines of redundant Git guidance per agent by centralizing everything from atomic commits to advanced workflows. It's marked as non-user-invocable, so it works as background knowledge that agents can reference when they encounter version control tasks. If you're building agents that touch codebases, this prevents you from copy-pasting the same Git best practices everywhere.

skills.sh installs: 568
GitHub stars: 79
last updated: Aug 21, 2026

View on GitHub

Install

$ npx -y skills add bobmatnyc/claude-mpm-skills --skill git-workflow --agent claude-code

Installs into .claude/skills of the current project.

Files

Git Workflow

Essential Git patterns for effective version control. Eliminates ~120-150 lines of redundant Git guidance per agent.

Commit Best Practices

Conventional Commits Format

<type>(<scope>): <subject>

<body>

<footer>

Types:

feat: New feature
fix: Bug fix
docs: Documentation only
refactor: Code change that neither fixes bug nor adds feature
perf: Performance improvement
test: Adding or updating tests
chore: Build process, dependencies, tooling

Examples:

feat(auth): add OAuth2 authentication

Implements OAuth2 flow using Google provider.
Includes token refresh and validation.

Closes #123

fix(api): handle null response in user endpoint

Previously crashed when user not found.
Now returns 404 with error message.

perf(db): optimize user query with index

Reduces query time from 500ms to 50ms.

Atomic Commits

# Good: Each commit does one thing
git commit -m "feat: add user authentication"
git commit -m "test: add auth tests"
git commit -m "docs: update API docs for auth"

# Bad: Multiple unrelated changes
git commit -m "add auth, fix bugs, update docs"