git-conventions
Shared git conventions for personal repos covering remote naming, primary remote choice, conventional commit shape, worktree placement, and commit/PR writing style. Use when setting up or renaming remotes, choosing where to push or open PRs, deciding where a worktree lives, or when another git skill points here.
Works with
--- name: git-conventions description: Shared git conventions for personal repos covering remote naming, primary remote choice, conventional commit shape, worktree placement, and commit/PR writing style. Use when setting up or renaming remotes, choosing where to push or open PRs, deciding where a worktree lives, or when another git skill points here. license: MIT --- # Git Conventions ## Remotes - Name remotes by host: `github` for GitHub, `forge` for the personal Forgejo instance. Never `origin`. - Set up both remotes when possible; the second acts as a backup mirror. - Each repo picks one primary remote at setup. The primary owns CI and pull requests, and is what "origin" means in conversation. Default primary: `github`. ## Commits and PR titles First line is `type(scope): description`, scope optional. Types: `feat`, `fix`, `docs`, `ci`, `build`, `chore`, `refactor`, `test`, `perf`, `revert`. ## Worktrees Worktrees are optional. Manual ones live at `<repo>/.worktrees/<branch>` with slashes flattened to dashes, and the directory stays gitignored. Native harness worktree homes (for example Claude Code's `.claude/worktrees/`) are equally fine. Keep project folders free of bare worktree siblings. ## Writing style - Plain sentences with periods and commas; sentence-case headings. - Write for the repo's durable history: describe the change itself, never plans, milestones, or phases. Branch names may keep stack prefixes like `m2/prng` since branches are deleted at merge. - Skip emdashes and decorative emoji.
More Git Workflows skills
git-commit
github/awesome-copilot
Execute git commit with conventional commit message analysis, intelligent staging, and message generation. Use when user asks to commit changes, create a git commit, or mentions "/commit". Supports: (1) Auto-detecting type and scope from changes, (2) Generating conventional commit messages from diff, (3) Interactive commit with optional type/scope/description overrides, (4) Intelligent file staging for logical grouping
git-workflow-and-versioning
addyosmani/agent-skills
Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, or when you need to organize work across multiple parallel streams. Use when cutting a release, choosing a semantic version bump, tagging, or writing a changelog.
resolve-merge-conflicts
warpdotdev/common-skills
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.
