Skip to content

dimpletz/git-manager

v1.4.0MIT

Git Managers are a collection of skills that help you manage Git repositories.

git-diff-generator

Generates a diff file for a whole branch, a pull request, a remote branch, a commit range, a single commit, the first commit, or staged files. Use this skill whenever you need a saved .diff artifact from Git history or the index. Do NOT use this skill for merging, resolving conflicts, or reviewing code inline.

git-encoding-normalizer

Normalizes tracked text files whose diffs are caused only by line-ending churn or mixed text encodings. Use this skill when a Git diff looks suspiciously large because of CRLF/LF-only changes or when a text file has been saved with inconsistent encoding. Do NOT use it for binary files, content rewrites, or merge conflict resolution.

git-merge-auditor

Audits whether a target branch contains all commits and changes from a source branch. Use this skill whenever you want to verify that a merge, rebase, or cherry-pick operation did not miss any updates — before or after merging. Do NOT use this skill to perform the merge itself; for that, use the git-merge-conflict-resolver skill.

git-merge-conflict-resolver

This skill provides git merge support for resolving conflicts. Use this skill ONLY if the merge has conflict or if you are in the middle of a merge with conflict. Do NOT use this skill if the merge has no conflict. Do NOT attempt to resolve merge conflicts yourself - always use this skill instead. Indicators to use this skill include errors such as "error: Merging is not possible because you have unmerged files." or "fatal: Exiting because of an unresolved conflict."

git-pr-cloner

Clones (fetches) a pull request from a remote Git repository into a local tracking branch. Supports both GitHub/GitLab-style remotes and Bitbucket remotes. Use this skill whenever the user wants to check out or fetch a PR/pull-request locally without merging it. Do NOT use this skill for creating, reviewing, or merging pull requests.

git-worktree-manager

Manages Git worktrees with a consistent naming convention. Use this skill whenever the user wants to create, list, move, remove, or purge a Git worktree. The worktree directory is always placed beside the repository root and follows the pattern <REPO>-worktree-<BRANCH>. Do NOT use this skill for general Git branching, merging, or cloning tasks.