git-workflow

git-workflow is a skill for Claude Code, Codex from nimadorostkar/Claude-Skills-collection. It costs 39 tokens per session (972 once invoked), scanned A, original, MIT.

A guide to managing Git repositories, including branches, commits, history, conflicts, and releases. Git is the tool developers use to track code changes and collaborate safely.

In plain words
What is it for?
Use it to prepare focused commits, clean up branch history, choose rebase or merge, resolve conflicts, recover lost work, and find the commit that caused a regression.
Why use it?
It helps keep project history understandable and recover work after mistakes such as bad rebases, resets, or force-pushes. A clear history also makes regressions easier to find and changes easier to undo.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one.

Good fit Use it to prepare focused commits, clean up branch history, choose rebase or merge, resolve conflicts, recover lost work, and find the commit that caused a regression.

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

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.

agentmods badge for git-workflow

README.md
[![agentmods](https://agentmods.dev/badge/skills/nimadorostkar/claude-skills-collection/git-workflow/github.svg)](https://agentmods.dev/skills/nimadorostkar/claude-skills-collection/git-workflow)
Your own site
<a href="https://agentmods.dev/skills/nimadorostkar/claude-skills-collection/git-workflow"><img src="https://agentmods.dev/badge/skills/nimadorostkar/claude-skills-collection/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/nimadorostkar/claude-skills-collection/git-workflow"><img src="https://agentmods.dev/badge/skills/nimadorostkar/claude-skills-collection/git-workflow.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 39 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 972 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. Third-party audits
  • NVIDIA SkillSpector warn 7 Sept 2026
SkillSpector: 2 findings, up to high

These are SkillSpector’s own severities. On a checked sample its high-severity flags on skills were ~96% false positives — a documented command, a public API, a “never do X” rule — so we show them as a caution to read, not a verdict. Why →

  • high Tool Misuse · line 53
    Tool parameters are crafted to achieve unintended or unsafe behavior. Parameter abuse can bypass intended safety checks (e.g. shell=True, --force, dangerous glob patterns).
    Fix: Validate all tool parameters against an allowlist. Reject dangerous parameter values (shell=True, --force, -rf /) and use safe defaults.
  • high Tool Misuse · line 81
    Tool parameters are crafted to achieve unintended or unsafe behavior. Parameter abuse can bypass intended safety checks (e.g. shell=True, --force, dangerous glob patterns).
    Fix: Validate all tool parameters against an allowlist. Reject dangerous parameter values (shell=True, --force, -rf /) and use safe defaults.
How audits are shown
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.00039 $0.00972
Opus 5 $0.00019 $0.00486
Sonnet 5 $0.00008 $0.00194
Haiku 4.5 $0.00004 $0.00097

Measured 12d ago against content hash f65d004368cb, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-11, 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 12d 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/development/git-workflow/SKILL.md · 98 lines

How it starts

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

Git Workflow

Purpose

Keep history readable and recoverable. A good history is a debugging tool: it lets you bisect, revert, and explain. A bad one is a wall of "fix", "fix again", "wip".

When to Use

  • Structuring commits before opening a pull request.
  • Recovering from a bad rebase, reset, or force-push.
  • Bisecting to find the commit that introduced a regression.
  • Cleaning up a branch's history.
  • Deciding a team branching strategy.

Capabilities

  • Atomic commit construction, including interactive staging.
  • History rewriting: interactive rebase, squash, fixup, autosquash.
  • Recovery: reflog, ORIG_HEAD, git restore, cherry-pick.
  • Bisection, including automated bisection with a test script.
  • Conflict resolution and rerere.

Inputs

  • The repository state and the branch's relationship to its base.
  • Whether the branch has been pushed and whether others have based work on it.

Outputs

  • A branch whose commits each build, pass tests, and do one thing.
  • Commit messages that explain why, not what.
  • A rebase or merge that preserves the ability to revert cleanly.

Workflow

  1. Commit atomically — One logical change per commit. Use git add -p to split a messy working tree.
  2. Write the message for the future — Subject in the imperative under 72 characters; body explaining why the change was needed.
  3. Clean before reviewgit rebase -i to squash fixups and reorder. Reviewers should read the story, not the process.
  4. Rebase private branches, merge shared ones — Rewriting history that others have pulled is how you lose their work.
  5. Recover with reflog — Almost nothing is truly lost. git reflog shows every position HEAD has held.

Best Practices

  • Never git push --force to a shared branch. Use --force-with-lease, which refuses if someone else has pushed.
  • A commit that does not build is a commit that breaks bisect. Keep every commit green.
  • git commit --fixup <sha> plus git rebase -i --autosquash makes review-response commits disappear cleanly.
  • Do not commit generated files, secrets, or large binaries. Removing them later requires rewriting history for everyone.
  • git bisect run ./test.sh finds the offending commit automatically. It is the fastest regression hunt available.
  • Enable rerere — Git will remember how you resolved a conflict and reapply it next time.

Read the full file on GitHub · 98 lines

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. 12d ago First seen · 98 lines · 39 tokens per session scan A f65d004368cb

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository nimadorostkar/Claude-Skills-collection (26 stars, last pushed 24d ago), licensed MIT. It adds 39 tokens to every session and 972 once invoked, about $0.0002 per session on Opus 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-30.

Related

Other skills, from other repositories