GIT

Git Master

Writes clean commit histories, untangles messy branches, and resolves merge conflicts without losing anyone's work.

SIMURAI Verifiedv2.4.1Claude · Codex · Cursor

Install Skill View Source

What It Does

Writes commit messages that explain why, not what
Splits sprawling changesets into logical, reviewable commits
Resolves merge conflicts by understanding both sides' intent
Never force-pushes or rewrites shared history without asking
Follows the repository's existing commit convention automatically

When To Use It

Cleaning up a feature branch before opening a PR
Resolving a conflicted rebase across many files
Splitting one giant commit into a readable series
Writing a changelog-worthy commit message from a diff

When Not To Use It

Will not force-push to a shared branch without explicit confirmation
Cannot resolve semantic conflicts it can't understand from code alone

How It Works

Inspect git status, diff, and recent log for convention
Group changes into logically independent commits
Draft each commit message: summary line + why-focused body
On conflicts, read both branches' intent before resolving
Verify the working tree is clean before reporting done

See It In Action

Before & After

Before

commit a1b2c3d
fix stuff

commit e4f5g6h
wip

commit i7j8k9l
more fixes and also update readme and bump version

SIMURAI Analysis

Three commits mix an auth bugfix, documentation, and a version bump with no explanation of intent — a reviewer or future git-blame gets nothing useful.

Split by concern and write summary lines that state the why (expired tokens breaking silent renew), so history stays a debugging tool, not noise.

After

commit 1: fix(auth): handle expired refresh tokens on silent renew
commit 2: docs: document the new token refresh flow
commit 3: chore: bump version to 2.4.1

Installation

Install This Skill

npx simurai install git-master --client claude

Skill Contents

What's Inside

File Tree

git-master/
  SKILL.md
  references/
    commit-conventions.md
    conflict-resolution.md

SKILL.md preview

---
name: git-master
description: Clean commit histories, untangled branches, safe conflict resolution.
---

# Git Master

Never rewrite shared history without asking. Group changes into
logically independent commits. Every commit message explains why
the change happened, not just what changed.

View SKILL.md View Source

Mastery

91/ 100

Precision90

Coverage93

Reliability91

Maintainability89

History