376 free skills
Git Workflows skills
Skills for git — commit message conventions, branching strategy, rebase workflows, merge conflict resolution, and git hooks.
Sourced from real, public repositories — synced daily, never invented.
376 free skills
Skills for git — commit message conventions, branching strategy, rebase workflows, merge conflict resolution, and git hooks.
Sourced from real, public repositories — synced daily, never invented.
15 tools across six categories
13 of them never send your data anywhere
Free · No signup · No trial clock
SEE THE DIRECTORY
git-rebase
rmsite/skills
Intelligently handle git rebase operations and resolve merge conflicts while preserving features and maintaining code quality. Use when rebasing feature branches, resolving conflicts across commits, and ensuring clean linear history without losing changes.
git-rebase
tzussman/kernel-dev-skill
Use when the user wants to rebase commits, reword commit messages,
git-rebase
ch3cooh/claude-skills
指定範囲のコミットを1つに統合（squash）するためのinteractive rebase手順とコミットメッセージを生成する。「コミットをまとめたい」「squashしたい」「rebaseでコミット整理」「履歴をきれいにしたい」「コミット統合」などの依頼時に使用。
rebased
dupe-com/skills
Rebase the current branch onto origin/main and intelligently resolve any conflicts that arise. Use when the user invokes /rebased or asks to rebase the current branch on main and resolve conflicts.
rebase
scrumdojo/quizmaster
Rebase the current branch and validate each step. Supports two scenarios: on a feature branch (or worktree) runs `git rebase master` against local master; on master itself runs `git pull --rebase`. Use when the user says /rebase, asks to rebase, or sync the branch.
rebase-on-main
andrewthetechie/andrew-skills
Safely rebase the current Git branch onto the repository's mainline branch with backups, conflict analysis, validation, and force-with-lease pushing. Use when the user asks to rebase, sync, update, replay, or force-push a feature branch on top of main or master.
rebase
acartine/osterman
Rebase current work branch on latest main with intelligent conflict resolution.
rebase-branch
e-krebs/clankers-kit
Rebase the current branch onto its freshly-fetched base, losing no work from either side; auto-skip already-integrated commits and escalate only genuinely complex conflicts. Use when asked to 'rebase this branch', 'rebase onto <base>', or 'update my branch'. Not for merging or squashing.
merge-resolver
rjmurillo/ai-agents
Resolve merge conflicts by analyzing git history and commit intent. Handles PR conflicts, branch conflicts, and session file conflicts with automated resolution for known patterns. Use when you say "resolve merge conflicts", "fix conflicts on this branch", "PR has conflicts with main", "can't merge due to conflicts", or "resolve PR conflicts". Do NOT use for rebasing, cherry-picking, or complex history rewrites (use git-advanced-workflows).
rebase
drewdrewthis/claude-skills
Rebase current branch on origin/main. Use when the user says 'rebase', 'rebase main', 'update from main', 'sync with main', or before opening a PR.
rebase
ayunis-core/ayunis-core
Rebase a branch onto another — resolve merge conflicts carefully by inspecting each conflict individually. Use when rebasing, restacking, or resolving merge conflicts.
rebase
jhostalek/dotclaude
Use when the user asks to rebase the current branch onto another branch or update branch history without merging.
git-advanced
ain3sh/.agents
Advanced Git techniques for history editing, commit recovery, and cross-branch operations. Use when rebasing, cherry-picking, bisecting for bugs, recovering lost commits via reflog, splitting or squashing commits, or cleaning up history before a PR.
rebase-stacked-pr
altinn/altinn-studio
Rebase a stacked PR onto main after its parent was squash-merged, using `git rebase --onto` to skip already-merged commits. Use when rebasing a stacked or dependent PR, handling a squash-merged parent PR, or recovering from empty commits or spurious conflicts after `git rebase main`.
merge-conflict
nickbevers/claude-rules
Detect and resolve git merge conflicts. Triggers on "merge conflict", "resolve conflict", "conflict markers", "fix conflicts", "merge failed".
yarn-lock-conflict-resolution
modulify/validator
Use this skill when resolving merge or rebase conflicts in yarn.lock. It standardizes taking yarn.lock from the target branch as source of truth, then running yarn install, and reusing the previous successful resolution as the base for repeated conflict rounds.
resolving-merge-conflicts
axiomantic/spellbook
Use when git merge or rebase fails with conflicts, you see 'unmerged paths' or conflict markers (<<<<<<< =======), or need help resolving conflicted files. Triggers: 'merge conflict', 'fix the conflicts', 'conflicting changes', 'resolve conflicts', 'can't merge'.
cflx-resolve
tumf/conflux
Conflict resolution and sequential merge guidance for Conflux parallel execution. Provides fixed rules for merge conflict resolution, pre-sync requirements, and retry continuation. CRITICAL - This skill CANNOT ask questions or request user input.
mobile-conflict-resolution-android
couchbaselabs/agent-skills
Couchbase Lite conflict resolution for Android (Kotlin) — custom conflict resolvers, merge strategies, auto-purge on channel removal, handling conflicts in push replication
git-hooks-toolkit
johnnywang2001/openclaw-skills
Generate, install, and manage Git hooks with pre-built templates. Includes hooks for linting staged files, enforcing conventional commits, blocking debug statements, preventing large file commits, auto-formatting code, requiring ticket references, protecting branches, running tests before push, and auto-installing dependencies after merge. Use when setting up git hooks, enforcing commit conventions, or automating pre-commit/pre-push checks.
git-hooks-precommit
mish-design/skills
Add a pre-commit workflow using Husky + lint-staged to run linters/formatters on staged files. Use when a user asks for pre-commit hooks, linting before commit, auto-fix on commit, or setting up Husky/lint-staged.
git-guardrails
simonmw66d/skills
Set up Cursor 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 Cursor.
git-pr-workflow
andymai/brepjs
This skill should be used when committing, pushing, branching, or merging in the brepjs repository — when a task involves "pre-commit hook failed" (which tier ran, how to bypass), "commit rejected by commitlint", "subject may not be empty", the pre-push knip tier firing, "create a branch", "set up a worktree", "open a PR", "arm auto-merge", or deciding whether a commit needs a `!` breaking marker. Covers hook anatomy and tiers, conventional-commit message format, branching, worktrees, and the PR/merge process. For diagnosing a specific gate or lint error see quality-gates; for a red CI job see ci-triage.
hooks
dev-mosuk/mosuk-ui
>-
engineering-git-workflow-master
itzfaisal/agency-agents
Expert in Git workflows, branching strategies, and version control best practices including conventional commits, rebasing, worktrees, and CI-friendly branch management.
git-guardrails-claude-code
amit-t/skills
Set 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.
hooks
oornnery/skills
Hook design and maintenance for local automation. Use when creating, renaming, wiring, reviewing, or debugging hooks, hook matchers, JSON payload handling, lifecycle reminders, autofix behavior, or safety gates.
git-pre-push-hook-ssh-timeout
dbochman/dotfiles
>-
git-guardrails-claude-code
cleytonsilva/skills
Set 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-guardrails-claude-code
fernandopardo/skills
Set 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.
branching-strategy-weapon
jzferrell26/dm-skills
Branching strategy advisor for Git-based teams. Owns model selection (trunk-based development, GitHub Flow, GitFlow), release and hotfix branch patterns, the merge-vs-rebase argument, the long-lived-branch trap, and the feature-flag vs feature-branch decision. Use when the user says "which branching model should we use", "we have too many merge conflicts", "our release process is broken", "GitFlow or trunk-based?", "merge or rebase?", "should I use a feature flag or a branch?", "set up GitHub Merge Queue", or when `branching-strategy-guardian` is invoked. Do NOT use for Git mechanics (interactive rebase, conflict resolution, history rewriting — that is `git-guardian`), branch protection ruleset configuration (that is `github-repo-health-guardian`), or CI/CD pipeline topology (that is `devops-guardian`).
plan-branch-strategy
pkuppens/on_prem_rag
Ensures work is on a named branch before edits. Use at session start when on main, at planning time before implementation, or when the feature-branch hook blocks edits on main.
plan-branch-strategy
pkuppens/pkuppens
Creates the feature branch for planned work. Use at planning time before any code edits, or when the feature-branch hook blocks an edit on main.
branch
kieranpotts/skills
>-
sync-branch-safely
mshindi-labs/agent-skills
>
branch
iwatake2222/alpamayo_webrtc
Create a new feature branch following naming conventions. Uses Git MCP for branch operations.
no-deep-flag-review
tinker495/codex-assets
Review deep UI/mode flag passing into domain or renderer internals; suggest strategy/boundary fixes.
branch
scottsbaldwin/blueprint
Create a traceable Git branch for the current task.
branch
versusjl/devin-blueprint
Create a traceable Git branch for the current task.
Git Workflow Master
53able/agency-agents
Expert in Git workflows, branching strategies, and version control best practices including conventional commits, rebasing, worktrees, and CI-friendly branch management.
agency-git-workflow-master
haigou123/skills
Expert in Git workflows, branching strategies, and version control best practices including conventional commits, rebasing, worktrees, and CI-friendly branch management.
monorepo-architect
atilamedeiros/skills
Expert in monorepo architecture, build systems, and dependency management at scale. Masters Nx, Turborepo, Bazel, and Lerna for efficient multi-project development. Use PROACTIVELY for monorepo setup,
monorepo-architect
4gentic/obelus
Expert in monorepo architecture, build systems, and dependency management at scale. Masters Nx, Turborepo, Bazel, and Lerna for efficient multi-project development. Use PROACTIVELY for monorepo setup,
monorepo-deps
allemaar/open-skills
>
monorepo-doctor
chris23lngr/.skills
Deeply audits a monorepo (especially Turborepo-based ones) that has grown organically and now feels out of hand — build pipeline, package boundaries, code duplication across apps, CI/CD, quality gates, config sharing, env/secret hygiene, performance, and docs — then produces a phased migration plan to bring it to an enterprise-grade setup. Use this whenever the user says a monorepo has "grown out of hand," asks for a monorepo health check, audit, or "state of the repo" review, wants to know if their Turborepo setup follows best practices, or asks for a plan to refactor/clean up/modernize/consolidate a monorepo. This is analysis-and-planning only — it produces an ANALYSIS.md and a MIGRATION_PLAN.md and does not execute changes; for day-to-day turbo.json/pipeline/caching configuration questions on a repo that isn't in crisis, defer to the turborepo skill instead.
monorepo-expert
eliranabu/schoolclaudeskills
>
monorepo-management
abanoub-ashraf/manus-skills-import
Master monorepo management with Turborepo, Nx, and pnpm workspaces to build efficient, scalable multi-package repositories with optimized builds and dependency management. Use when setting up monorepos, optimizing builds, or managing shared dependencies.
monorepo-management
hacho55/absolutelyskilled
>
monorepo-management
krishnakanthb13/antigravity-awesome-skills
Master monorepo management with Turborepo, Nx, and pnpm workspaces to build efficient, scalable multi-package repositories with optimized builds and dependency management. Use when setting up monor...
monorepo-management
ranbot-ai/awesome-skills
Build efficient, scalable monorepos that enable code sharing, consistent tooling, and atomic changes across multiple packages and applications.
conflicts
supersuit-tech/permission-slip
Continuously pull the latest main branch and resolve merge conflicts automatically. Polls every 90 seconds and exits after 10 consecutive clean cycles.
git-conflict-resolution
jcchikikomori/skills-md
Resolve git merge/rebase conflicts. Use when stashing WIP before pulling, mid-conflict with <<<< markers, or running a fetch+rebase. Covers stash-pull-pop, conflict markers, checkout --ours/--theirs, and abort/recovery.
rebase
jamie-bitflight/claude_skills
Strategic rebase with mandatory pre-analysis. Use when asked to rebase a branch onto main (or any target). Runs a file-level diff of both sides before touching git, produces a per-file disposition plan (KEEP/MERGE/DROP/REWRITE), and only then executes the rebase. Prevents surprise conflicts and silent data loss from rebasing without knowing what changed on both sides. Triggers: 'rebase', 'rebase onto main', 'rebase this branch', 'rebase and merge', 'update branch from main'.
rebase
artifact-depot/artifact-depot
Rebase the current branch onto main.
git-hooks-automation
tmolavi/mcp-agent-skills-hub
Master Git hooks setup with Husky, lint-staged, pre-commit framework, and commitlint. Automate code quality gates, formatting, linting, and commit message enforcement before code reaches CI.
merge-conflict-resolution
anur4ag/pr-completion
Safely resolve Git merge, rebase, cherry-pick, or revert conflicts by understanding both sides and validating the result. Use for conflicted branches, upstream updates, or stuck continuation operations.
git-guardrails
manastalukdar/ai-devstudio
Install a Claude Code PreToolUse hook that blocks dangerous git operations (force push, reset --hard, clean -f, branch -D, checkout ., restore .) before they execute. Use when setting up git safety hooks or preventing destructive git commands in Claude Code.
git-guard
thedevappsecguy/sec-skills
Set up Claude Code hooks to block dangerous git commands before they execute, including `git push`, `git reset --hard`, `git clean`, `git branch -D`, and checkout or restore of the working tree. Use this skill when the user wants to prevent destructive git operations, protect a repo from accidental pushes or resets, add git safety hooks, or make git commands safer.
git-guardrails-claude-code
agentkollektivet/magentic
Set 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-guardrails-claude-code
arifmolon/skills
Set 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.