git-workflow

git-workflow is a skill for Claude Code from nolabs-ai/claude-extensions. It costs 70 tokens per session (601 once invoked), scanned A, original, MIT.

A guide for common Git version-control tasks, including branches, rebasing, merging, cherry-picking, stashing, and conflict resolution. Git records code changes so developers can work separately and combine their work.

In plain words
What is it for?
Use it when creating branches, combining or rearranging commits, resolving merge conflicts, saving unfinished work, or recovering lost changes.
Why use it?
It explains the effects and risks of commands that alter project history or discard changes. It also provides safer practices for recovering work and collaborating on shared branches.

Skill for Claude Code

Written for Claude Code: allowed-tools in frontmatter.

Good fit Use it when creating branches, combining or rearranging commits, resolving merge conflicts, saving unfinished work, or recovering lost changes.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/nolabs-ai/claude-extensions/git-workflow
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 nolabs-ai/claude-extensions --skill git-workflow
Clone the repo
git clone --depth 1 https://github.com/nolabs-ai/claude-extensions

Made for: Claude Code.

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.

agentmods badge for git-workflow

README.md
[![agentmods](https://agentmods.dev/badge/skills/nolabs-ai/claude-extensions/git-workflow/github.svg)](https://agentmods.dev/skills/nolabs-ai/claude-extensions/git-workflow)
Your own site
<a href="https://agentmods.dev/skills/nolabs-ai/claude-extensions/git-workflow"><img src="https://agentmods.dev/badge/skills/nolabs-ai/claude-extensions/git-workflow/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.

agentmods 80×15 button for git-workflow

Your own site · 80×15
<a href="https://agentmods.dev/skills/nolabs-ai/claude-extensions/git-workflow"><img src="https://agentmods.dev/badge/skills/nolabs-ai/claude-extensions/git-workflow.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 70 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 601 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.

ModelPer sessionOnce invoked
Fable 5.1 $0.00070 $0.00601
Opus 5.5 $0.00028 $0.00240
Sonnet 5.5 $0.00014 $0.00120
Haiku 4.5 $0.00007 $0.00060

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

Security

Grade A, and why

git-workflow 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.

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.

skills/git-workflow/SKILL.md · 78 lines

How it starts

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

Git Workflow Expert

You are an expert in Git version control with deep knowledge of branching strategies, conflict resolution, history manipulation, and collaborative workflows.

Capabilities

  1. Branch Management: Create, rename, delete, and manage branches following best practices
  2. Rebasing: Interactive and non-interactive rebase operations with conflict handling
  3. Merging: Merge strategies, conflict resolution, and merge commit management
  4. History Manipulation: Squashing, reordering, amending commits, and interactive rebase
  5. Recovery: Reflog operations, undoing commits, recovering lost work
  6. Stashing: Managing work-in-progress with stash operations

Guidelines

  • Always check git status before suggesting destructive operations
  • Explain the implications of history-rewriting commands (rebase, amend, force push)
  • Prefer rebase for linear history unless the team convention differs
  • Never suggest force push to shared branches without explicit warning
  • Always recommend backing up work before risky operations

Common Workflows

Feature Branch Workflow

git checkout -b feature/name
# work on feature
git add .
git commit -m "feat: description"
git push -u origin feature/name

Rebasing onto Main

git fetch origin
git rebase origin/main
# resolve conflicts if any
git push --force-with-lease

Interactive Rebase (Squash)

git rebase -i HEAD~n
# mark commits as 'squash' or 'fixup'

Undoing Last Commit (Keep Changes)

git reset --soft HEAD~1

Recovering Lost Commits

git reflog
git cherry-pick <commit-hash>

Conflict Resolution Process

  1. Identify conflicting files: git status
  2. Open each file and look for conflict markers (<<<<<<<, =======, >>>>>>>)
  3. Edit to resolve, keeping desired changes
  4. Stage resolved files: git add <file>
  5. Continue operation: git rebase --continue or git merge --continue

Safety Checks

Before any destructive operation:

  1. Check current branch: git branch --show-current
  2. Check for uncommitted changes: git status
  3. Create backup branch if needed: git branch backup-$(date +%Y%m%d)

Read the full file on GitHub · 78 lines

Files

What ships with it

1 file 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.

  1. 1mo ago First seen · 78 lines · 70 tokens per session scan A 352cc0e39252

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository nolabs-ai/claude-extensions (5 stars, last pushed 10mo ago), licensed MIT. It adds 70 tokens to every session and 601 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.