A guide for carrying out Git tasks, where Git is the version-control system used to track code changes and collaborate safely.

Creating and switching branches, committing and pushing code, merging or rebasing branches, resolving conflicts, and using separate worktrees.

It provides a consistent process for saving changes, managing parallel lines of work, and handling conflicts between them.

git-ops — Skill for Claude Code and Codex by TheSethRose

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Any agent

npx skills add TheSethRose/Copilot-Skills --skill git-ops

Clone the repo

git clone --depth 1 https://github.com/TheSethRose/Copilot-Skills

Made for: Claude Code, Codex.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

README.md

[![agentmods](https://agentmods.dev/badge/skills/thesethrose/copilot-skills/git-ops/github.svg)](https://agentmods.dev/skills/thesethrose/copilot-skills/git-ops)

Your own site

<a href="https://agentmods.dev/skills/thesethrose/copilot-skills/git-ops"><img src="https://agentmods.dev/badge/skills/thesethrose/copilot-skills/git-ops/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

Your own site · 80×15

<a href="https://agentmods.dev/skills/thesethrose/copilot-skills/git-ops"><img src="https://agentmods.dev/badge/skills/thesethrose/copilot-skills/git-ops.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

Per session 81 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.

When invoked 1,631 The whole file, excluding the scripts and references it only reads on demand.

Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.

Origin original No closer match found in the catalogue.

Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

Model	Per session	Once invoked
Fable 5.1	$0.00081	$0.01631
Opus 5.5	$0.00032	$0.00652
Sonnet 5.5	$0.00016	$0.00326
Haiku 4.5	$0.00008	$0.00163

Measured 1mo ago against content hash be7ab0e781f5, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

git-ops scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 1mo ago.

The scan reads SKILL.md. This mod also ships 4 executable files (scripts/commit_helper.sh, scripts/conflict_resolver.sh, scripts/git_safe_exec.sh, …), listed below but not scanned — reading those needs a real analyzer, not pattern matching.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.github/copilot-skills/operations/git-ops/SKILL.md · 237 lines

How it starts

The opening of the file, as written. The whole thing — 237 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Git Operations

Stage all changes, create conventional commits, manage branches safely, and resolve conflicts with systematic approaches.

When to Use

Automatically activate when the user:

Explicitly asks to commit and push ("commit and push", "push these changes")
Mentions saving work to remote ("save to github", "push to remote")
Needs to create or manage branches ("create a feature branch", "switch branches")
Encounters merge conflicts ("fix conflicts", "resolve merge")
Wants isolated workspace for parallel work ("create worktree for feature X")
Asks to finish development ("finish this branch", "complete development")
Mentions rebasing, pulling, or other git operations

What It Does

1. Commit and Push Workflow

Stages all changes
Generates conventional commit message (or uses provided message)
Pushes to remote branch (with -u for new branches)
Shows PR link for GitHub repos
Validates before each step

2. Branch Management

Create feature branches from latest main
List and manage active branches
Delete branches safely (with verification)
Switch between branches
Rename branches

3. Merge and Rebase

Merge branches with conflict detection
Rebase with safety checks
Handle merge conflicts systematically
Preview changes before merge/rebase

4. Isolated Worktrees

Create parallel workspaces for simultaneous development
Automatically verify .gitignore configuration
Setup development environment in worktree
List and manage active worktrees
Clean up worktrees after completion

5. Conflict Resolution

Identify conflicted files
Show conflict markers
Guide manual resolution
Verify resolution before commit

Approach

Smart Commit Message Generation

When user doesn't provide a message, analyze staged changes to generate conventional commit:

Steps:

Analyze changed files (git diff --cached --name-only)
Determine commit type:
- feat: New feature (default)
- fix: Bug fix
- docs: Documentation changes
- test: Test updates
- chore: Dependencies, config changes
- refactor: Code restructuring
Extract scope from directory/component (first changed file path)
Generate description in imperative mood ("Add", not "Added")
Keep under 90 characters

Read the full file on GitHub · 237 lines

Files

What ships with it

5 files beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

1mo ago First seen · 237 lines · 81 tokens per session scan A be7ab0e781f5

Subscribe to this mod's changes

git-ops is a skill published in the GitHub repository TheSethRose/Copilot-Skills (3 stars, last pushed 10mo ago), licensed MIT. It adds 81 tokens to every session and 1,631 once invoked, about $0.0003 per session on Opus 5.5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Git and workflow claude-skills copilot github skills

resolve-pr-comments

Evaluate, fix, answer, and reply to GitHub pull request review comments and conversation comments. Handles both change requests (fix or skip) and reviewer questions (explain using the rationale recalled from past Claude Code transcripts). Use when the user asks to "resolve PR comments", "fix review comments", "address…

tobihagemann/turbo · 96 tokens

create-pr

Create a GitHub pull request with a drafted title and description. Use when the user asks to "create a PR", "create a pull request", "open a PR", or "submit a PR".

tobihagemann/turbo · 44 tokens

update-pr

Update an existing GitHub pull request's title and description to reflect the current state of the branch. Use when the user asks to "update the PR", "update PR description", "update PR title", "refresh PR description", or "sync PR with changes".

tobihagemann/turbo · 56 tokens

reply-to-pr-threads

Draft, confirm, and post replies to GitHub PR review threads. Handles per-category reply formatting, re-fetches thread resolution state so auto-resolved threads are skipped, posts via GraphQL, resolves threads whose entry carries a resolution reason, and dismisses the code-scanning alert behind a thread whose entry…

tobihagemann/turbo · 97 tokens

changelog-rules

Shared changelog conventions and formatting rules referenced by /create-changelog and /update-changelog. Not typically invoked directly.

tobihagemann/turbo · 29 tokens

ship

Commit, push, and optionally create or update a PR for the current staged changes. Use when the user asks to "ship", "ship it", "ship changes", "commit push and PR", or "ship this".

tobihagemann/turbo · 47 tokens