fix-git-issues

fix-git-issues is a skill for Claude Code, Codex, Cursor from emaraschio/cursor-commands. It costs 13 tokens per session (336 once invoked), scanned A, original, MIT.

Diagnose and fix git state problems.

Skill for Claude CodeCodexCursor

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.

agentmods
npx agentmods add skills/emaraschio/cursor-commands/fix-git-issues
Any agent
npx skills add emaraschio/cursor-commands --skill fix-git-issues
Clone the repo
git clone --depth 1 https://github.com/emaraschio/cursor-commands

Made for: Claude Code, Codex, Cursor.

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 fix-git-issues

README.md
[![agentmods](https://agentmods.dev/badge/skills/emaraschio/cursor-commands/fix-git-issues.svg)](https://agentmods.dev/skills/emaraschio/cursor-commands/fix-git-issues)
Your own site
<a href="https://agentmods.dev/skills/emaraschio/cursor-commands/fix-git-issues"><img src="https://agentmods.dev/badge/skills/emaraschio/cursor-commands/fix-git-issues.svg" alt="Measured on agentmods" height="20"></a>
Per session 13 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 336 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin unknown 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 $0.00013 $0.00336
Opus 5 $0.00006 $0.00168
Sonnet 5 $0.00003 $0.00067
Haiku 4.5 $0.00001 $0.00034

Measured today against content hash 0b75ade219a4, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

fix-git-issues 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 today.

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.

.cursor/skill-contracts/fix-git-issues/SKILL.md · 46 lines

What it actually says

Overview

Help resolve common Git problems and conflicts with step-by-step commands and explanations for each situation.

Steps

  1. Merge Conflicts
    • Analyze conflicting changes and their context
    • Provide resolution strategies for different conflict types
    • Suggest the best approach to preserve important changes
    • Generate resolved code maintaining functionality
  2. Branch Management
    • Help with branch cleanup and organization
    • Suggest rebasing vs merging strategies
    • Assist with cherry-picking specific commits
    • Guide through complex branch operations
  3. Commit History
    • Help with commit message improvements
    • Assist with squashing and organizing commits
    • Guide through interactive rebase operations
    • Fix commit authorship and metadata
  4. Repository Issues
    • Help recover from detached HEAD state
    • Assist with undoing commits and changes
    • Guide through stash management
    • Resolve submodule and remote issues

Git Issues Checklist

  • Problem identified and analyzed
  • Git commands provided with explanations
  • Resolution strategy validated
  • Changes tested and verified
  • Repository state clean and functional

Guardrails

  • Get explicit consent before destructive git commands (reset, rebase, or history rewrite).
  • Never force-push main or a shared branch without an explicit request.
  • Explain each command before running it.
  • Never print or commit secrets or credential files (.env, .env.*, keys); flag any exposure instead of committing it.
Files

What ships with it

3 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.

  1. today First seen · 46 lines · 13 tokens per session scan A 0b75ade219a4

Subscribe to this mod's changes

fix-git-issues is a skill published in the GitHub repository emaraschio/cursor-commands (9 stars, last pushed 27d ago), licensed MIT. It adds 13 tokens to every session and 336 once invoked, about $0.0001 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.

Related

Other skills, from other repositories

grok-build-supervisor

Initialize the persistent local proxy, then immediately ensure a visible Grok Build TUI for the current workspace when /grokexecute on activates, and continuously supervise that coding-agent session through a user-level Supervisor daemon as the user sends work, waits for completion, reconnects from another host task…

Vanyangyang/cursor-bridge · 103 tokens

cursor-delegate

Delegate bounded light-to-medium implementation, investigation, documentation, configuration, testing, and tooling work to Cursor Bridge after the primary agent owns direction and risk boundaries. Also use when the user explicitly asks to create, keep, continue, inspect, or close the same Cursor execution session…

Vanyangyang/cursor-bridge · 151 tokens

grok-executor-mode

Task-local execution policy applied to ordinary user tasks only after an exact /grokexecute on; the host agent then plans, supervises, corrects, and verifies while all implementation and workspace-mutating execution goes through Grok Build Supervisor. Never activate or deactivate from ordinary requests, task text…

Vanyangyang/cursor-bridge · 73 tokens

deep-research

Conducts multi-step deep research on any topic using iterative search, reflection, and synthesis. Use when the user asks to research, investigate, survey, compare, analyze, deep-dive, or explore a topic in depth. Covers web research, codebase analysis, documentation review, mixed-source investigation, and M3…

madebyaris/advance-minimax-m3-cursor-rules · 72 tokens

incident-triage-harness

Production-style incident triage workflow for logs, metrics, code, safe mitigations, and M3 multimodal visual evidence (screenshots, screen recordings). Use when debugging alerts, regressions, outages, or suspicious runtime behavior.

madebyaris/advance-minimax-m3-cursor-rules · 53 tokens

web-design

Build distinctive, production-grade frontend interfaces with high design quality. Use when asked to build websites, landing pages, dashboards, web apps, or any web UI that should look polished and modern. Generates creative, polished code that avoids generic AI aesthetics. Includes Yesterday corporate identity…

Yesterday-AI/skills · 64 tokens