AI agent skills for git and version control

pedronauck Bundle

Rebase branches and resolve cross-commit conflicts while preserving changes. Excludes merge-commit workflows, cherry-picking, and repository setup.

kimtth Skill

Use when: clean up or reorder commits with rebase while keeping history safe and reviewable.

zach-source Skill

Git version control essentials and best practices. Use when working with git repositories, commits, branches, merges, rebases, remotes, or resolving conflicts. Triggers on git commands, branch operations, merge/rebase questions, or version control workflows.

dimon94 Skill

Land a finished branch on local main with linear history — commit pending work, commit main's own dirt first, rebase onto main, fast-forward main. Use when the user asks to rebase/merge/合回主分支 into local main after work is committed. Local only, never touches remotes.

loopyluci Skill

Squash, reorder, and clean up commits interactively.

dtsong Skill

Rebase current branch onto main with guidance

aspiers Skill

Rebases every local branch of a fork onto a moved upstream, flags the ones upstream has superseded, and rebuilds the mixdown branch that combines them. Use after fetching a fork's upstream and finding it has advanced far, been force-pushed, or rewritten its history; when several stacked or sibling branches all need bringing forward at once; when a branch was cut from a mixdown and now carries merge commits it should not have; or when asked to rebase all branches, re-mix, or bring a whole worktree set up to date.

eous Skill

Git version control workflows, branching strategies, and best practices. Use when discussing git commands, branching, merging, rebasing, or version control workflows. Triggers on mentions of git, branch, merge, rebase, commit, pull request, GitHub, GitLab, version control.

laurigates Skill

Advanced git rebase — linear history, stacked PRs, --update-refs, --onto. Use when rebasing branches, cleaning history, managing PR stacks, or fixing merge-heavy branches.

producible Skill

Git version control operations: commits, branches, merges, rebases, history.

matrixx0070 Bundle

Branch, commit, merge, and release using Git best practices including conventional commits and rebase workflow

damilola-elegbede-org Bundle

Rebase current branch on latest main or specified branch. Use when updating branch with upstream changes.

motlin Skill

Rebase local commits on the configured upstream using the plugin rebase script.

andersonlimahw Skill

Rebase branches and manage interactive rebase sessions.

alleneubank Skill

Use when syncing a feature branch onto the latest origin base branch via git rebase.

futurejj Bundle

Git version control including branching strategies, interactive rebase, bisect, hooks, conflict resolution, and monorepo workflows. Trigger for git branching questions, merge conflicts, rebase strategies, or git workflow design.

flurdy Bundle

Rebase the current branch onto an updated main, an updated stacked parent, or main after the parent PR merged. Proves the child-only commit range before rewriting anything; explicit gates for dirty trees, tests, force-push, and PR retargeting.

jmerta Bundle

Use when the user asks to rebase or update a Git branch onto another ref, handle rebase conflicts, or verify rewritten history. Protects dirty worktrees, resolves conflicts by intent, and keeps force-push as a separate authorized action.

farm-fe Skill

Fetch origin/main, rebase current branch, resolve conflicts safely, then commit and push changes; create a PR if none exists for the branch.

korya Bundle

Rebase a work-in-progress or completed branch onto a new base, ensuring the rebased changes still satisfy their original spec, comply with the (possibly updated) architecture, conventions, and invariants of the new base, and introduce no regressions. Use when the user says "rebase this branch on X", "rebase my work on master", "move these commits onto the new base", or otherwise asks to migrate a set of commits onto a different base than they were authored against.

imtiazrayhan Skill

Rebase the current branch onto its base and walk every conflict methodically, resolving each by understanding both sides. Use when your feature branch has fallen behind main and you want a clean, linear history without clobbering changes.

jal-co Skill

Git and GitHub CLI mastery for version control operations. Use proactively for commits, branches, PRs, rebases, conflict resolution, and git history management. Covers conventional commits, branching strategies, and GitHub workflows. Examples: - user: "Commit these changes" → stage files, create conventional commit - user: "Create a PR" → push branch, use gh pr create with proper template - user: "Rebase on main" → fetch, rebase, handle conflicts - user: "Fix merge conflict" → identify conflicts, resolve, complete merge - user: "Squash my commits" → interactive rebase guidance - user: "What's the git history?" → git log with appropriate flags

lisa-tarbo Skill

Use when squashing fixup commits into earlier commits, cleaning up a feature branch with interactive rebase, recovering a dropped or failed autosquash, inserting a reformatting commit before code changes, moving file changes between commits, splitting one working-tree edit across several historical commits, or diagnosing autosquash conflicts.

jamie-bitflight Skill

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'.