git-workflow-helper

git-workflow-helper is a skill for Claude Code, Codex from khalilbenaz/claude-skills-collection. It costs 96 tokens per session (1,620 once invoked), scanned A, original, MIT.

A guide to using Git, the version-control system for tracking code changes, branches, and collaboration. It covers conflicts, rebasing, reverting commits, and workflow choices.

In plain words
What is it for?
Use it to diagnose branches and unpushed commits, resolve merge or rebase conflicts, undo or correct commits, and choose a branching workflow.
Why use it?
It helps recover from confusing Git states and resolve conflicts without losing work. It also provides a structured way to inspect changes before taking action.

Skill for Claude CodeCodex

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

Good fit Use it to diagnose branches and unpushed commits, resolve merge or rebase conflicts, undo or correct commits, and choose a branching workflow.

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

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

Your own site · 80×15
<a href="https://agentmods.dev/skills/khalilbenaz/claude-skills-collection/git-workflow-helper"><img src="https://agentmods.dev/badge/skills/khalilbenaz/claude-skills-collection/git-workflow-helper.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 96 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,620 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: 4 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 60
    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 148
    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 85
    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 147
    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.00096 $0.01620
Opus 5 $0.00048 $0.00810
Sonnet 5 $0.00019 $0.00324
Haiku 4.5 $0.00010 $0.00162

Measured 7d ago against content hash f141194775a6, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-10, from the pricing page.

Security

Grade A, and why

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

dev-skills/git-workflow-helper/SKILL.md · 196 lines

How it starts

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

Git Workflow Helper

1. Diagnostic initial

Avant toute action, évaluer la situation :

git status                        # état de l'index et du working tree
git log --oneline --graph -15     # historique visuel récent
git stash list                    # stashs en attente
git remote -v                     # remotes configurées

Identifier : branche courante, commits non-pushés, fichiers modifiés/stagés, conflits actifs.


2. Résolution de conflits de merge

Étapes :

  1. Lancer le merge ou rebase, observer les conflits :
    git merge feature/ma-branche
    # ou
    git rebase main
    
  2. Lister les fichiers en conflit :
    git diff --name-only --diff-filter=U
    
  3. Éditer chaque fichier : supprimer les marqueurs <<<<<<<, =======, >>>>>>>, garder le bon code.
  4. Marquer comme résolu et continuer :
    git add <fichier-résolu>
    git merge --continue     # ou git rebase --continue
    
  5. En cas d'impasse, annuler proprement :
    git merge --abort        # ou git rebase --abort
    

Outil visuel (recommandé) :

git mergetool               # ouvre vimdiff, VS Code, IntelliJ selon config

3. Annuler / corriger des commits

Situation Commande Risque
Défaire le dernier commit (garder les modifs) git reset --soft HEAD~1 Faible
Défaire le dernier commit (perdre les modifs) git reset --hard HEAD~1 Destructif
Corriger le message du dernier commit git commit --amend --no-edit Faible si pas pushé
Annuler un commit déjà pushé (safe) git revert <sha> Nul — crée un commit inverse
Supprimer un commit du milieu de l'historique git rebase -i HEAD~N Modéré

Règle d'or : ne jamais --force-push sur main/master. Sur une branche feature partagée, prévenir l'équipe.


4. Rebase interactif — recette type

git fetch origin
git rebase -i origin/main

Dans l'éditeur, remplacer pick par :

  • squash (s) — fusionner dans le commit précédent
  • reword (r) — changer le message
  • drop (d) — supprimer le commit
  • fixup (f) — squash sans garder le message

Read the full file on GitHub · 196 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. 7d ago First seen · 196 lines · 96 tokens per session scan A f141194775a6

Subscribe to this mod's changes

git-workflow-helper is a skill published in the GitHub repository khalilbenaz/claude-skills-collection (22 stars, last pushed 16d ago), licensed MIT. It adds 96 tokens to every session and 1,620 once invoked, about $0.0005 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-09-03.