Git Workflow

Feature branches, commit hygiene, rebasing vs. merging, and collaborative workflows.

48 stars 10 forksGit & Code Review Plugin marketplace

Install

Claude Code plugin
/plugin marketplace add sethdford/claude-skills

The repo is a Claude Code plugin marketplace. Run /plugin afterwards to pick the plugin that includes this skill.

skills CLI (Claude Code, Cursor, Codex and more)
npx skills add sethdford/claude-skills --skill git-workflow
Manual install
git clone --depth 1 https://github.com/sethdford/claude-skills.git /tmp/claude-skills
mkdir -p ~/.claude/skills
cp -r /tmp/claude-skills/engineer/engineer-toolkit/skills/git-workflow ~/.claude/skills/git-workflow

Personal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.

From the SKILL.md

# Git Workflow

Using git effectively in a team; clean history, clear commits, easy reviews.

## Context

You are defining or following a git workflow. Choose one; stick with it.

## Domain Context

- **Feature Branches**: One feature per branch; enables parallel work
- **Commit Hygiene**: Clear, atomic commits; easy to revert/bisect
- **Rebasing**: Clean history; keep commits on top of main
- **Merging**: Merge commits preserve history; understand tradeoffs
- **Squashing**: Combine commits; useful before merging
- **Code Review**: PRs on branches; review before merge to main

## Instructions

1. **Branch Naming**: feature/auth-flow, fix/login-bug, chore/deps
2. **Commits**: One logical change per commit; testable independently
3. **Commit Messages**: Subject line, blank line, body explaining why
4. **Rebase**: Keep feature branch on top of main; clean history
5. **PR**: Feature branch → main; requires approval; automated checks
6. **Merge Strategy**: Squash for small features; rebase for large; merge commits for releases
7. **Cleanup**: Delete branch after merging

## Anti-Patterns

- Huge commits; hard to review, hard to bisect
- Unclear commit messages; "fix stuff" doesn't help
- Merging without PR; no review, no CI checks
- Rebasing shared branches; confuses collaborators
- Thousand merge commits; clutters history

## Further Reading

- Atlassian Git Workflows
- GitHub Flow (simple and popular)
- Git documentation
Read the full skill on GitHub

Details

Skill name
git-workflow
Path
engineer/engineer-toolkit/skills/git-workflow/SKILL.md
License
MIT
Repo updated
11 March 2026

FAQ

What does the Git Workflow skill do?

Feature branches, commit hygiene, rebasing vs. merging, and collaborative workflows.

How do I install the Git Workflow skill?

Claude Code plugin: /plugin marketplace add sethdford/claude-skills. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.

Is Git Workflow popular?

It lives in sethdford/claude-skills, which has 48 GitHub stars and 10 forks.

Related skills

Browse the most popular Claude skills, all git & code review skills, or write your own with the skills generator.