commit-fixup

commit-fixup is a skill for Claude Code, Codex from 2ykwang/agent-skills. It costs 110 tokens per session (1,354 once invoked), scanned A, a copy of commit-fixup, MIT.

A skill for folding uncommitted changes into the earlier commits where they belong, using fixup commits and an autosquash rebase. A rebase rewrites the branch's commit history.

In plain words
What is it for?
Amending changes into existing commits and preparing a cleaner commit history on the current branch.
Why use it?
It cleans up review edits and keeps each commit focused, but requires safety checks because rewriting history can affect shared branches.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one. Also seen: names the AskUserQuestion tool.

Good fit Amending changes into existing commits and preparing a cleaner commit history on the current branch.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/2ykwang/agent-skills/commit-fixup
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 2ykwang/agent-skills --skill commit-fixup
Clone the repo
git clone --depth 1 https://github.com/2ykwang/agent-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.

agentmods badge for commit-fixup

README.md
[![agentmods](https://agentmods.dev/badge/skills/2ykwang/agent-skills/commit-fixup/github.svg)](https://agentmods.dev/skills/2ykwang/agent-skills/commit-fixup)
Your own site
<a href="https://agentmods.dev/skills/2ykwang/agent-skills/commit-fixup"><img src="https://agentmods.dev/badge/skills/2ykwang/agent-skills/commit-fixup/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 commit-fixup

Your own site · 80×15
<a href="https://agentmods.dev/skills/2ykwang/agent-skills/commit-fixup"><img src="https://agentmods.dev/badge/skills/2ykwang/agent-skills/commit-fixup.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 110 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,354 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 100% copy Near-identical to another mod 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.00110 $0.01354
Opus 5.5 $0.00044 $0.00542
Sonnet 5.5 $0.00022 $0.00271
Haiku 4.5 $0.00011 $0.00135

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

Security

Grade A, and why

commit-fixup 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.

Origin

This is a copy

100% identical to commit-fixup — 0 lines differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.

skills/commit-fixup/SKILL.md · 126 lines

How it starts

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

commit-fixup

Absorb uncommitted changes into the existing commit each one should have been part of, leaving clean history. Four stages: safety checks → mapping → scope confirmation → execution and verification. This rewrites history, so don't skip any stage's checks.

1. Safety checks

git status --short                       # uncommitted changes
git merge-base HEAD origin/<default-branch>  # establish base (use the repo's default branch)
git log --oneline <base>..HEAD           # commits in scope
git branch -vv                           # upstream and push state
git log --merges --oneline <base>..HEAD  # merge commits in range
git --version

Tell the user before proceeding if any of these hit:

  • Branch already pushed → stop and ask. Rebasing means a force-push afterwards, and only the user makes that call. Never run a force-push on your own.
  • Merge commits in range → stop. The rebase flattens the merge structure.
  • git older than 2.44 → don't proceed. That version lacks the non-interactive git rebase --autosquash this skill relies on. Say the git version is too old to automate this safely and point at an upgrade (macOS: brew upgrade git, Ubuntu: apt upgrade git).
  • Untracked files are not absorption targets. Leave them alone.

2. Mapping: find the target commit for each changed file

For each modified file, find the commit in branch range that touched it last:

git log --oneline <base>..HEAD -- <file> | head -1

Why last-toucher: even when an earlier commit is the semantic owner, if a later commit also touched the file, fixing up into the earlier one makes the rebase conflict. The last-toucher rule guarantees a conflict-free, fully automatic rebase. It trades a little history aesthetics for safety — call out the affected files in the mapping table.

Mapping results fall into three buckets:

  • Mapped: a commit in the branch touched that file
  • Unmapped: no commit touched it (new file, or a change to a file from outside the branch)
  • One file's changes needing to split across several commits → references/edge-cases.md

Read the full file on GitHub · 126 lines

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. 1mo ago First seen · 126 lines · 110 tokens per session scan A 118bca25ac80

Subscribe to this mod's changes

commit-fixup is a skill published in the GitHub repository 2ykwang/agent-skills (19 stars, last pushed 2mo ago), licensed MIT. It adds 110 tokens to every session and 1,354 once invoked, about $0.0004 per session on Opus 5.5. A static security scan graded it A with 0 findings. It is 100% identical to commit-fixup, differing in 0 lines, and is treated as a copy.

Related

Other skills, from other repositories

ship-it

A GitHub workflow for finishing an implemented issue: commit the relevant changes, push a branch, create a pull request, merge it, and close the issue. GitHub is a service for hosting code and reviewing changes, and a pull request is a proposed change for review.

smallnest/goal-workflow · 96 tokens

commit-message-writing

Use this skill when the user explicitly asks to generate, write, draft, or create a commit message, squash commit, commit title, or merge commit message for the Shopware core repository (shopware/shopware). Supports two modes — full commit messages (title + body) for branch commits, and squash merge titles…

shopwareLabs/ai-coding-tools · 160 tokens

verification-gate

You MUST use this when work is about to be called complete, done, fixed, ready, or mergeable - before a completion claim, a merge or pull request, a branch finish, or a handoff report.

sentimony/skills · 48 tokens

review-request

You MUST use this when a completed or partially committed implementation needs an independent code review against explicit requirements, a defined task scope, and the actual Git diff, including committed and working-tree changes.

sentimony/skills · 41 tokens

commit-all

You MUST use this when the user asks to commit all current changes at once, via /commit-all or in words ("commit everything", "commit all changes"), without giving a commit message of their own.

sentimony/skills · 44 tokens

agy-delegate

Delegate coding tasks to the Google Antigravity CLI (agy) only when the user explicitly requests it, while the orchestrator retains review and landing responsibility.

lingxling/awesome-skills-cn · 35 tokens