commit-fixup

A guide for folding uncommitted code changes into the earlier commits where they belong. It uses Git fixup commits and an autosquash rebase, which rewrites local commit history into a cleaner sequence.

In plain words
What is it for?
Use it to clean up review fixes, amend changes into existing commits, and prepare a tidy branch history.
Why use it?
It removes the need to leave follow-up commits for changes that should have been part of an earlier commit.

Skill for Claude CodeCodex

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/2ykwang/cview/commit-fixup
Any agent
npx skills add 2ykwang/cview --skill commit-fixup
Clone the repo
git clone --depth 1 https://github.com/2ykwang/cview

Made for: Claude Code, Codex.

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. Scan, not verified.
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 $0.00110 $0.01354
Opus 5 $0.00055 $0.00677
Sonnet 5 $0.00022 $0.00271
Haiku 4.5 $0.00011 $0.00135

Measured 2d ago against content hash 118bca25ac80, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, 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 2d 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

Copies of this mod

1 near-identical copy found in the catalogue:

.agents/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. 2d 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/cview (20 stars, last pushed 26d ago), licensed MIT. It adds 110 tokens to every session and 1,354 once invoked, about $0.0006 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

ship-it

Code commit, PR creation, merge, and issue closure workflow via GitHub CLI (gh). Triggers after a goal (GitHub Issue) implementation is complete — commit code, push branch, create PR, merge, then close the issue. Use when the user says "提交代码", "commit and merge", "创建PR", "合入", "关闭issue", "ship-it", or when a goal…

smallnest/goal-workflow · 96 tokens

agent-harness-fault-injection

Use when an agent workflow needs deterministic recovery evidence for sandbox, MCP/tool, worker, checkpoint, memory, or orchestration failures.

sickn33/agentic-awesome-skills · 34 tokens

submit-pr-from-current-changes

Create a branch, commit existing local changes, push them, and open a pull request. Use when submitting current work as a PR.

alibaba/page-agent · 34 tokens

prowler-commit

Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.

prowler-cloud/prowler · 33 tokens

prek

Use when setting up or running hooks with prek in any repository. prek is a Rust drop-in alternative to pre-commit for running Git hooks that check, format, lint, and validate code and repository files. Prefer it when speed, workspace mode, built-in hooks, shared toolchains, or native TOML configuration matter.

j178/prek · 67 tokens

review-delta

Review only changes since last commit using impact analysis. Token-efficient delta review with automatic blast-radius detection.

tirth8205/code-review-graph · 24 tokens