Skip to content
kramme:recreate-commits logo

kramme:recreate-commits

Use when asked to recreate commits with narrative-quality history on the current branch.

SKILL.md

Full skill instructions

Reimplement the current branch with a clean, narrative-quality git commit history suitable for reviewer comprehension. By default, recreate commits on the current branch (not a new clean branch).

Steps

  1. Validate the source branch

    • Identify the current branch name and the base branch (master or main).
    • If on main or master, stop and ask the user to switch to a feature branch first.
    • Fetch and update the local base branch to ensure it matches the remote:
      git fetch origin <base-branch>
      git checkout <base-branch>
      git merge --ff-only origin/<base-branch>
      git checkout -  # return to feature branch
      
      If the fast-forward merge fails (local base branch has diverged from remote), abort and ask the user to resolve manually before retrying.
    • Ensure the current branch has no merge conflicts, uncommitted changes, or other issues.
    • Confirm it is up to date with the base branch.
  2. Analyze the diff

    • Study all changes between the current branch and master (or main depending on your repository).
    • Form a clear understanding of the final intended state.
  3. Prepare the branch

    • By default, work on the current branch. Do NOT create a {branch_name}-clean branch unless explicitly requested.
    • If explicitly asked to use a clean branch, create {branch_name}-clean from the merge base with main/​master.
  4. Plan the commit storyline

    • Break the implementation down into a sequence of self-contained steps.
    • Each step should reflect a logical stage of development—as if writing a tutorial.
  5. Reimplement the work

    • Reset the branch to the merge base with main/​master.
    • Recreate the changes, committing step by step according to your plan.
    • Each commit must:
      • Introduce a single coherent idea.
      • Include a clear commit message and description.
      • Add comments or inline GitHub comments when needed to explain intent.
  6. Verify correctness

    • Confirm that the final state of the branch exactly matches the final intended state (same as before the reset).
    • Use --no-verify only when necessary (e.g., to bypass known issues). Individual commits do not need to pass tests, but this should be rare.

There may be cases where you will need to push commits with --no-verify in order to avoid known issues. It is not necessary that every commit pass tests or checks, though this should be the exception if you're doing your job correctly. It is essential that the end state of the branch be identical to the original end state before the reset.

Misc

  1. Never add yourself as an author or contributor on any branch or commit.
  2. Write your pull reuqest following the same instructions as in the pr.md command file.
  3. In your pull request, include a link to the original branch.

Your commit should never include lines like:

🤖 Generated with [Claude Code](https://claude.com/​claude-code)

or

Co-Authored-By: Claude Sonnet 4.5 <[email protected]>

Or else I'll get in trouble with my boss.

More skills from majiayu000

xiaohongshu logo
majiayu000/claude-arsenal

xiaohongshu

xiaohongshu

286 148
View
agent-task-conductor logo
majiayu000/claude-skill-registry

agent-task-conductor

Conduct multi-agent task orchestration and workflow coordination.

663 1
View
conductor-setup logo
majiayu000/claude-skill-registry

conductor-setup

Initialize project with Conductor artifacts (product definition,

663 1
View
animation-designer logo
majiayu000/claude-skill-registry

animation-designer

Expert in web animations, transitions, and motion design using Framer Motion and CSS

663 1
View
diagramming logo
majiayu000/claude-skill-registry

diagramming

Creates Mermaid and ASCII diagrams for flowcharts, architecture, ERDs, state machines, mindmaps, and more. Use when user mentions diagram, flowchart, mermaid, ASCII diagram, text diagram, terminal diagram, visualize, C4, mindmap, architecture diagram, sequence diagram, ERD, or needs visual docume...

663 1
View
h3-pg logo
majiayu000/claude-skill-registry-data

h3-pg

PostgreSQL bindings for H3 hexagonal grid system. Use when working with H3 cells in Postgres, including spatial indexing, geometry/geography integration, and raster analysis.

23 1
View
conductor-development logo
majiayu000/claude-skill-registry

conductor-development

Context-Driven Development skill for projects using Conductor. Use this skill when you detect a `conductor/` directory in the project, when working on tasks defined in a `plan.md` file, or when the user asks about tracks, specs, or plans. Automatically applies TDD workflow, tracks task completion...

663 1
View
conductor-status logo
majiayu000/claude-skill-registry

conductor-status

Display project status, active tracks, and next actions

663 1
View
dockerization logo
majiayu000/claude-skill-registry

dockerization

Official Stakpak application containerization standard operating procedure, a step-by-step guidline to properly dockerize applications. This is a rule book curated by the Stakpak Team.

663 1
View

Popular AI tools

Kaiber logo
Video

Kaiber

Generate, edit, and beat-sync AI video with leading models in one workspace.

Paid
View
Vimcal logo
Productivity

Vimcal

The world's fastest calendar for remote work

Free
View

Transform Your Design with AI Designer by ImgCreator.ai

Freemium
View
Akool AI logo
Content & writing

Akool AI

Revolutionizing Video Production with AI-Powered Creativity

Paid
View

Extend an image past the frame and let AI fill the new aspect ratio.

Freemium
View
StarByFace logo
Security

StarByFace

Discover your celebrity doppelgänger with StarByFace!

Free
View
C

ChainClarity explains 700+ crypto whitepapers in plain English, with layered summaries, comparisons, research tools, alerts, and a $4.99 Pro plan.

Freemium
View
Opus Clip logo
Coding & apps

Opus Clip

Opus.ai: Revolutionize Your Web Experience

Free
View