250 free skills · page 4 of 5
Git Workflows skills
Skills for git — commit message conventions, branching strategy, rebase workflows, merge conflict resolution, and git hooks.
Real files from public repositories — hand-curated, never invented. Sorted by installs.
4 / 5page
git-workflowtatat/agents-playgroundManage Git branches, commits, and pull requests following best practicesGit Workflows14
git-advanced-workflowsthapaliyabikendra/ai-artifactsMaster advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.Git Workflows14
git-flow-masterupex-galaxy/agentic-qa-boilerplateEnd-to-end Git operator for any branching strategy. Auto-detects the project's strategy (solo-main, main+integration, enterprise multi-branch, trunk-based, GitFlow, GitHub Flow, GitLab Flow, SDET integration-trunk for chained test-automation suites) from .git config, branches, and the git_strategy: block in .agents/project.yaml, then adapts every commit, branch, push, PR, conflict-fix, and chained-PR action to that strategy. Use this skill whenever the user wants to: create a branch (crear branch, new feature branch, start work on UPEX-123), commit changes (commit this, commitear esto, make a commit, commit and push), push code (push, push to main, push to staging, subir cambios), open a pull request (create PR, open PR, abrir PR, crear pull request, gh pr create), fix merge conflicts (fix conflict, resolver conflicto, merge conflict, rebase conflict, push rejected), plan stacked or chained PRs (stack of PRs, chained PRs, split this PR, PR demasiado grande), set up an isolated git worktree (worktree, work in a worktree, isolate this work, parallel session, aislar el trabajo, trabajar aislado), set up or bootstrap a branching strategy on a fresh repo (set up our git strategy, bootstrap branching, configura el flujo de git, git strategy setup, materialize the git flow, create the staging branch and write the runbook), or pick / change / set up a branching strategy (git flow, git strategy, branching strategy, which git flow do we use, set up our git strategy, bootstrap branching, configura el flujo de git). Trigger even when the user does not say git-flow-master literally — if the work is git-or-PR-shaped, this is the right tool. Do NOT use for: testing tickets (use /sprint-testing), authoring test cases in TMS (use /test-documentation), writing automated tests (use /test-automation), running regression suites (use /regression-testing), or general code editing — git-flow-master operates strictly on the version-control layer.Git Workflows14
git-squash-rebasetheoklitosbam7/skillsAfter a parent branch is squash-merged, main contains a new squash commit, not the parent's original commits. A child branch still based on those original commits must be moved with:Git Workflows13
cms-branches-aliasescontentstack/contentstack-agent-skillsAdvise developers on using Contentstack branches for isolated content development and aliases for zero-downtime content deployments. Cover branch strategy, branch-specific vs global modules, CI/CD integration, merge behavior, and rollback patterns.Git Workflows12
git-commitinsulinocytus/skillsExecute 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 groupingGit Workflows12
rebaseverygoodopensource/vgv-wingspanRebases the current feature branch onto the base branch (main/master/develop).Git Workflows12
git-conventionduckyman-ai/agent-skillsWrite conventional git commit messages following the Angular commit convention format. Use this skill whenever writing commit messages, creating commits, reviewing git history, generating changelogs, or any task involving git version control. Triggers when you see "commit", "git commit", "commit message", "changelog", "version control", "git history", "semantic commit", "conventional commit", or when the user asks to commit changes, create a PR, or review commit history. Also use when setting up commit linting or husky hooks for enforcing commit conventions.Git Workflows12
ss-branch-strategyjsirish/workflow-skillsEstablish consistent branch-naming and default-branch conventions across all module repos when executing a major framework or CMS version upgrade. Covers integer branch naming, default-branch promotion, previous-version preservation, and the fork-and-upstream workflow for third-party modules. Use when planning or executing a major version upgrade across a suite of repos.Git Workflows12
verasic-git-commits-auditmilkywayrules/verasic-skillsPre-push commit history audit against the Verasic commit convention. Use when the user asks to "audit commits", "check commit messages", "clean commit history", or before push/PR to verify branch history.Git Workflows12
git-workflowpfangueiro/claude-code-agentsGit workflow conventions and conflict/recovery procedures — Conventional Commits format, branching models (Git Flow, GitHub Flow, trunk-based), pull request structure and review checklists, merge-versus-rebase choice, cherry-pick, interactive rebase, and guarded use of history-rewriting or destructive commands. Covers the rebase inversion where --ours is the upstream and --theirs is the user's own work. Use when resolving a merge or rebase conflict, choosing or documenting a branching strategy, writing a commit message or PR description to a convention, deciding between merging and rebasing, undoing or reverting a commit, cleaning up history before a PR, or recovering work after a bad reset, rebase, or force-push. Not needed for routine single commands whose syntax is already known — git status, git add, git diff, git log, staging, a plain commit, or a straightforward push or pull.Git Workflows11
git-commithebertpaziam/skillsExecute 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 groupingGit Workflows11
commitmyuon/ccskillsConventional Commitsに従ってgit commitを実行Git Workflows11
hr-conflict-resolutiontuanductran/hr-skillsHelp HR managers with workplace conflict resolution. Use when asked to resolve a workplace conflict, mediate between employees, facilitate a difficult conversation, develop conflict resolution training, address a team dispute, create a conflict resolution policy, or any workplace conflict task.Git Workflows11
gh-subtreesnikhilmaddirala/gtd-ccSubtree publishing and project graduation. Publish monorepo changes to standalone GitHub repos, graduate projects from lab to production.Git Workflows10
commit-changestldraw/tldrawCreate a git commit for the current changes. Use when asked to commit changes, make a commit, generate a commit message, or commit the current worktree with optional user-provided context.Git Workflows10
conflict-resolutiontroykelly/codex-skillsUse when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrityGit Workflows10
committing-changesbitwarden/ai-pluginsGit commit conventions and workflow for Bitwarden repositories. Use when committing code, writing commit messages, or preparing changes for commit. Triggered by "commit", "git commit", "commit message", "prepare commit", "stage changes".Git Workflows10
bf-archive-sprintkhaki4/my_skills스프린트 내 모든 에픽이 완료된 후 스프린트 문서를 아카이빙한다. 문서 이동, git commit을 자동으로 수행한다.Git Workflows10commitmyuon/agent-skillsConventional Commitsに従ってgit commitを実行Git Workflows10gh-subreponikhilmaddirala/gtd-ccStateful bidirectional sync for subtree directories using git-subrepo. Sync monorepo subdirs with standalone GitHub repos and graduate projects from lab to production.Git Workflows10
fs-daily-reportfull-scale-teams/fs-daily-reportDrafts a non-technical daily work report from your latest Git commits (GitHub CLI, GitHub MCP, or GitLab MCP) and your active Jira tickets (Atlassian Rovo MCP). Use when the user asks for a daily report, standup update, EOD summary, client update, progress report, or 'what did I do today'. Runs a prerequisite check first, lets the user pick the reference Jira ticket from a picker widget, then emits a fixed-format stakeholder-ready summary with the technical detail translated into business language.Git Workflows8clean-copytldraw/tldrawReimplement the current branch on a new branch with a clean, narrative-quality git commit history. Use when asked to make a clean copy branch, clean up commit history by replaying work, or rebuild a branch as reviewable commits.Git Workflows8
install-precommitzbruhnke/claude-code-starterInstall the pre-commit review hook that forces you to understand changes before committing. Use when you want to enable commit reviews or when setting up a new project.Git Workflows8committing-android-changesbitwarden/androidGit commit conventions and workflow for Bitwarden Android. Use when committing code, writing commit messages, or preparing changes for commit. Triggered by "commit", "git commit", "commit message", "prepare commit", "stage changes".Git Workflows8branch-disciplinetroykelly/codex-skillsUse before any code changes - hard gate ensuring work never happens on main branch, with proper feature branch creation from correct baseGit Workflows8
git-hooks1mangesh1/dev-skills-collectionGit hooks setup with Husky, lint-staged, lefthook, and native hooks for automated code quality. Use when user asks to "setup pre-commit hooks", "add husky", "lint on commit", "format before commit", "run tests on push", "setup git hooks", "validate commit messages", "enforce conventional commits", "detect secrets in commits", "configure lefthook", "share git hooks", "core.hooksPath", "hook bypass", "debug git hooks", or automate code quality checks.Git Workflows7
git-merge-conflict-resolutionkentoshimizu/sw-agent-skillsResolve Git merge/rebase conflicts with explicit intent tracking and post-resolution verification. Use when conflicts occur and intent-preserving resolution is required before integration; do not use for CI workflow design or application behavior implementation.Git Workflows7
conflict-resolvemanastalukdar/ai-devstudioGuided conflict resolution with semantic analysis and validationGit Workflows7
port-conflict-resolutionpmarashian/cursor-agent-skillsCheck port availability before starting server, provide patterns for killing processes on ports, document automatic port selection strategies, include fallback port ranges, and provide health check patterns. Use when dev server fails to start due to port conflicts.Git Workflows7
git-cmtoilahuongg/shopify-agents-kitCommit changes to git with a descriptive conventional commit message. Use when ready to commit staged or unstaged changes.Git Workflows7
git-committungxuan1656/harness-slimExecute 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 groupingGit Workflows7
resolving-merge-conflictscarlitose/agent-skillsTrace both sides of an in-progress Git merge or rebase conflict, resolve compatible intent with scoped authority, and gate incompatible intent. Use only when the user explicitly asks to inspect or resolve current conflicts.Git Workflows7
git-guardrails-claude-codecosticapuntaru/agenticaSet up Claude Code hooks to block dangerous git commands (push, reset --hard, clean, branch -D, etc.) before they execute. Use when user wants to prevent destructive git operations, add git safety hooks, or block git push/reset in Claude Code.Git Workflows7git-branch-strategykentoshimizu/sw-agent-skillsDefine branch topology, lifecycle rules, and merge policy that match team delivery and release risk. Use when branch protection, release/hotfix flow, and merge discipline must be explicit to prevent unsafe history changes; do not use for CI workflow design or application behavior implementation.Git Workflows6commitmanastalukdar/ai-devstudioAnalyze changes and create meaningful conventional commits with pre-commit quality checksGit Workflows6
branchnicotinez/skillsRun stages 0 → 1 → 5, all of them below. Skip stages 2, 3 and 4 — never commit, never push, never open a pull request. Uncommitted work stays uncommitted, on the new branch. Stage 0 still resolves <remote> and <base>, and skips the gh / az check.Git Workflows6
x-gitx-cmd/skillThis skill provides comprehensive Git and code hosting platform management tools through x-cmd CLI, including GitHub, GitLab, Codeberg, Forgejo integration, and Git hooks management. This skill should be used when users need to manage Git repositories, work with code hosting platforms, automate Git workflows, or configure Git hooks from command line interfaces.Git Workflows6
git-workflowclay-hhk/claude-skillsThis skill should be used when the user asks to "create git commit", "manage branches", "follow git workflow", "use Conventional Commits", "handle merge conflicts", or asks about git branching strategies, version control best practices, pull request workflows. Provides comprehensive Git workflow guidance for team collaboration.Git Workflows6git-rebase-workflowkentoshimizu/sw-agent-skillsLinearize local branch history with safe rebase practices before integration. Use when branch history cleanup is needed and rebase risks (conflicts, dropped commits, rewritten history impact) must be controlled; do not use for CI workflow design or application behavior implementation.Git Workflows6
rebasemishamsk/skillsRebase the current branch onto the latest trunk ref, resolve conflicts deliberately, and run repository verification.Git Workflows6
branchesnyelonong/galdrUse when starting work on a new branch or worktree, or when a branch's implementation is done and it needs gates, review, a smoke sheet, and a decision about merge/push. Invoke via route or explicit command.Git Workflows6
git-workflow-guideasiaostrich/universal-dev-standardsVersion: 1.0.0 Last Updated: 2025-12-24 Applicability: Claude Code SkillsGit Workflows5branch-finishmanastalukdar/ai-devstudioComplete branch workflow with squash, rebase, and cleanupGit Workflows5
branch-creatoradonis0123/adonis-skillsCreate safe Git feature or hotfix branches with concise names. Use this whenever the user asks to create a branch, start work on a new feature or fix, wants a feat/... or hotfix/... branch name, asks for a short branch slug from a task description, or wants help before beginning local Git work. Default to recommending the branch name and command first, then create only after user confirmation. Do not push, commit, rebase, or create PRs.Git Workflows5
fix-merge-conflictsaniondev/aniondevpublicskillsResolves complicated merge conflicts in a git repository (merge, rebase, cherry-pick or stash-pop conflicts), by reconstructing the intent of both sides from the history instead of guessing from the conflict markers. Use when the user asks to resolve/fix merge conflicts, when a merge, rebase or cherry-pick stopped with conflicts, or when a conflict is too large or too semantic to resolve by simply picking one side.Git Workflows5
commit-messagediegoos/skillsTerse and exact. Why over what. Prefer atomic commits — one concern each.Git Workflows5merge-strategymanastalukdar/ai-devstudioIntelligent merge/rebase strategy selection with safe executionGit Workflows5
hooksandrewkamphey/video-ideasSame one video. Many different hooks only. The video concept stays fixed; only the opening angle, framing, or first-line promise changes.Git Workflows4
sync-with-primaryberrydev-ai/skillsThis skill brings the primary branch (usually main or master) up to date from the remote, then merges those updates into whatever branch is currently checked out — the everyday "my branch has fallen behind main, catch it up" workflow.Git Workflows4git-workflow-guideasiaostrich/universal-dev-skillsThis skill provides guidance on Git branching strategies, branch naming conventions, and merge operations.Git Workflows4
resolving-merge-conflictsbhagyamudgal/skillsResolve an in-progress git conflict without a silent drop. Use when the worktree is mid-merge, mid-rebase, mid-cherry-pick or mid-stash-pop — CONFLICT (content), <<<<<<< markers, Unmerged paths, or fix conflicts and then commit the result.Git Workflows4
bg-fix-conflictsbraingridai/braingridResolve merge conflicts between the current branch and main. Use when the workspace is in CONFLICT state after an automatic rebase failed. Detects, resolves, commits, and pushes — no feature work.Git Workflows4
branchdnd-mapp/agent-skillsCreate a git branch named for the work about to happen, deriving the type and slug from the diff, a known issue, or a description. Use when the user wants to start new work or asks to create a branch, or when another skill needs a branch before it can proceed.Git Workflows4
git-guardrails-claude-codefullheart/mattpocock-skills-opencodeSet up Claude Code hooks to block dangerous git commands (push, reset --hard, clean, branch -D, etc.) before they execute. Use when user wants to prevent destructive git operations, add git safety hooks, or block git push/reset in Claude Code.Git Workflows4
commit-messagegithub/copilot-cli-for-beginnersGenerate conventional commit messages - use when creating commits, writing commit messages, or asking for git commit helpGit Workflows4
git-commitliao666brant/agent-toolsExecute 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 "/git-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 groupingGit Workflows4
monorepo-architecturethejoaov/skillsUse when setting up, organizing, or reasoning about a TypeScript monorepo. Covers workspace managers (Bun, pnpm), Turborepo pipelines and caching, package boundary conventions (apps/packages/tooling tiers), dependency management with catalogs and version pinning, shared tooling packages, and cross-workspace build orchestration. Trigger when the user asks about monorepo structure, where to add a new package, how to configure Turborepo tasks, or how to manage shared dependencies.Git Workflows4
git-commityuler/skillsUse when the user wants to commit staged changes, asks for a commit message, or wants a concise summary of the staged diff before committing.Git Workflows4
merge-conflict-resolverauldsyababua/instructor-workflowAnalyze branch divergence, detect potential conflicts, and guide merge resolution for any Git repository. Auto-detects current branch or accepts parameters.Git Workflows4Other tasks
same rules, different job
