git-workflow
git-workflow provides structured guidance on writing effective commit messages using conventional formats, organizing branches by type and purpose, and managing pull requests at scale. It covers atomic commits, conflict resolution, and enforcing standards through git hooks.
git-workflow teaches conventional commit formats, branching strategies, and pull request workflows for maintaining clean git history.
AI-generated summary based on this skill's SKILL.md
Install
AsyrafHussin/agent-skills/git-workflow
git clone https://github.com/AsyrafHussin/agent-skills
cp -r agent-skills/skills/git-workflow ~/.claude/skills/git-workflownpx skillfed install AsyrafHussin/agent-skills/git-workflowFrequently asked questions
AI-generated answers based on this skill's SKILL.md and metadata
What are git best practices for commit messages?
git-workflow emphasizes conventional commits format as the foundation for effective commit messages. Structure messages with a type (feat, fix, docs, etc.), optional scope, and clear description. Keep the subject line under 50 characters, use imperative mood, and separate the body with a blank line. This approach enables automated changelog generation and improves team collaboration.
How should git-workflow handle branching strategy and naming?
git-workflow recommends establishing consistent branching conventions tied to purpose: feature branches (feature/description), bugfix branches (bugfix/description), and release branches (release/version). Naming consistency helps teams quickly understand branch intent. Pair this with a clear strategy—gitflow for complex releases or github flow for continuous deployment—based on your team's needs.
What does git-workflow say about pull request workflow?
git-workflow advocates for small, focused pull requests that address a single concern, making code review faster and more effective. Include a descriptive PR template, link related issues, and keep discussions constructive. This workflow improves code quality and team communication while reducing merge conflicts and review bottlenecks.
How does git-workflow keep git history clean?
git-workflow teaches atomic commits—small, logical units that each represent one change—and interactive rebase for cleanup before merging. Choose merge strategies carefully: rebase for linear history or merge commits for explicit integration points. Clean history makes debugging easier and improves project maintainability.
Can git-workflow enforce commit standards automatically?
Yes. git-workflow covers setting up git hooks using tools like Husky and commitlint to validate commits against your standards before they're pushed. Automated enforcement ensures team consistency without manual review, catching formatting issues and preventing non-compliant commits from entering the repository.
What's the difference between rebase vs merge in git-workflow?
git-workflow explains that rebase rewrites history for a linear, clean timeline—ideal for feature branches before merging to main. Merge commits preserve integration history and are safer for shared branches. Choose based on your workflow: rebase for local cleanup, merge for permanent integration points and collaborative branches.
SKILL.md
rendered from the published skill — quoted content, verbatim
Git Workflow
Git best practices, commit conventions, branching strategies, and pull request workflows. Guidelines for maintaining a clean, useful git history.
When to Apply
Reference these guidelines when: - Writing commit messages - Creating branches - Setting up git workflows - Reviewing pull requests - Maintaining git history
Rule Categories by Priority
| Priority | Category | Impact | Prefix |
|---|---|---|---|
| 1 | Commit Messages | CRITICAL | commit- |
| 2 | Branching Strategy | HIGH | branch- |
| 3 | Pull Requests | HIGH | pr- |
| 4 | History Management | MEDIUM | history- |
| 5 | Collaboration | MEDIUM | collab- |
Quick Reference
1. Commit Messages (CRITICAL)
commit-conventional- Use conventional commitscommit-atomic- Atomic
(truncated - see the full file via the links below)
Read as markdown · JSON record · Browse the source repository
File tree — 15 files
skills/git-workflow/AGENTS.md
skills/git-workflow/README.md
skills/git-workflow/SKILL.md
skills/git-workflow/metadata.json
skills/git-workflow/rules/_sections.md
skills/git-workflow/rules/_template.md
skills/git-workflow/rules/branch-delete-merged.md
skills/git-workflow/rules/branch-feature-workflow.md
skills/git-workflow/rules/branch-main-protected.md
skills/git-workflow/rules/branch-monorepo.md
skills/git-workflow/rules/branch-naming-convention.md
skills/git-workflow/rules/branch-release-strategy.md
skills/git-workflow/rules/branch-short-lived.md
skills/git-workflow/rules/branch-workflow-strategies.md
skills/git-workflow/rules/collab-code-review.md