Skip to content
Development
Skill

/git-conventions

Apply when committing, branching, or opening a pull request. Conventional commit format, branch naming, PR scope.

From plugin
skill-everything
2123 skills

Claude Code

$ npx -y skills add sordi-ai/skill-everything --skill git-conventions --agent claude-code

SKILL.md

git-conventions.SKILL.md
name: git-conventions
description: Apply when committing, branching, or opening a pull request. Conventional commit format, branch naming, PR scope.
license: MIT
version: 1.0.0
tokens_target: 650
triggers:
  - git commit
  - branch
  - pull request
loads_after: []
supersedes: []

Sub-Skill: Git & Workflow Conventions

<!-- target: ~650 tokens (real tiktoken count) | 15 rules -->

**Purpose:** Consistent commit history, clean branches, no merge conflicts through discipline. Rules that work in teams of 2–20 developers.

---

Rules

Commit Messages (Conventional Commits)

1. **Format:** `<type>(<scope>): <description>` — always lowercase, no period at the end.

  • Types: `feat`, `fix`, `refactor`, `test`, `docs`, `chore`, `perf`, `ci`
  • Example: `feat(auth): add JWT refresh token rotation`

2. **Description in imperative mood.** `add feature` not `added feature` or `adds feature`. 3. **Scope is the affected module name.** `fix(user-service): handle null email` — not `fix(backend)`. 4. **Mark breaking changes with `!`.** `feat(api)!: remove deprecated v1 endpoints` 5. **Body for non-obvious changes.** Explains the *why*, not the *what*.

Branching

6. **Branch names:** `<type>/<ticket-id>-<short-description>` — e.g. `feat/PROJ-123-user-export`. 7. **Feature branches live max. 2 days.** Longer → rebase daily onto `main`. 8. **No direct push to `main` or `develop`.** Always through a pull request. 9. **Delete branch before PR merge.** Clean up merged branches from remote.

Pull Requests

10. **PR title = commit message of the squash commit.** Consistency between PR and git log. 11. **Max. 400 lines diff per PR.** Larger → split. Reviewers cannot meaningfully review more than 400 lines. 12. **Self-review before opening a PR.** Read through once yourself, fix obvious mistakes.

Merge Strategy

13. **Squash-merge for feature branches.** Clean linear history on `main`. 14. **Merge commit for release branches.** So release points remain visible. 15. **`git rebase -i` before PR for clean commits.** Squash WIP commits together.

---

Why This Sub-Skill Earns Stars

The agent automatically creates correct commit messages and branch names. No manual corrections, no discussions in review about formatting.

Read more
@sordi-ai
Ships withskill-everything

Git-versioned agent memory: agents that never make the same mistake twice. Anthropic-Skill folder standard, multi-runtime (Claude Code, Cursor, Gemini CLI, OpenCode).

Stars on GitHub

Momentum

stars in total
21
Star history of sordi-ai/skill-everything on GitHub, a chart by star-history.com

Other skills on skill-everything.

code-quality

code-quality

Apply when writing or refactoring code. Generic rules to prevent the most common review comments — function length, naming, error…

db-schema

db-schema

Apply when designing database schemas, writing migrations, or reviewing table structure. Covers naming, keys, indexes,…

debugging

debugging

Apply when diagnosing a bug, reproducing a failure, or performing root cause analysis. Covers systematic isolation, binary…

docker

docker

Apply when writing or reviewing Dockerfiles, docker compose files, or container build pipelines. Covers layer caching,…

More skills from other plugins.

brainstorming
Auto-invoked

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, modifying behavior, or…

@obra@obraInstall Skill
ask-matt

ask-matt

Ask which skill or flow fits your situation. A router over the skills in this repo.

skills2w309k
@mattpocock@mattpocockInstall Skill
accessibility
Auto-invoked

accessibility

Design, implement, and audit accessible UI to WCAG 2.2 Level AA across Web, iOS, and Android — semantic ARIA roles and labels,…

ecc2w293k
@affaan-m@affaan-mInstall Skill
compiler-commit

compiler-commit

Use when you want to verify compiler changes and commit with the correct convention. Runs tests, lint, and format, then commits…

react5d252k
@facebook@facebookInstall Skill

Questions about git-conventions.

Which coding agents can use git-conventions?
git-conventions installs in Claude Code, Codex, Cursor, Gemini CLI, GitHub Copilot, OpenCode and Windsurf with the skills CLI, using each agent's flag shown on this page. Flowy's auto-invocation, which fires a skill when your prompt matches, runs in Claude Code only.