git-master

Split large multi-file Git edits into atomic commits using file-count and directory rules.

28|5|Updated Jan 26, 2026
One-click install
npx skills add https://github.com/MeroZemory/oh-my-droid --skill git-master-merozemory
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-master
Source: https://github.com/MeroZemory/oh-my-droid/tree/main/skills/git-master
Command: npx skills add https://github.com/MeroZemory/oh-my-droid --skill git-master-merozemory

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git Master prevents sprawling commits by enforcing atomic, multi-commit standards and guiding safe history edits so every feature stays traceable and rebase-ready.

Core Features & Use Cases

  • Commit Architect clarifies which files belong together, splitting edits per directory, component, or revertability so large diffs become reviewable history.
  • Rebase Surgeon ensures history rewriting is safe by checking style, stashing dirty work, avoiding rebasing main, and preferring force-with-lease once conflicts are resolved.
  • History Archaeologist answers questions like when a change happened or who introduced a line with targeted git log, git blame, and git bisect guidance, ideal for debugging regressions or auditing contributions.

Quick Start

Ask Git Master to inspect staged changes, detect the language and style from recent commits, and generate the required multi-commit structure before rebasing or pushing.

Frequently Asked Questions about git-master

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I split large multi-file edits into atomic commits before pushing?

Split large multi-file edits into atomic commits by applying directory-based and component-level splitting rules to group related changes. This process analyzes recent commit logs to detect language style, ensuring the resulting multi-commit structure remains clean and rebase-ready.

What is the safest way to rewrite git history and resolve conflicts during a rebase?

Rewrite git history safely by stashing dirty work, avoiding rebasing main, and preferring force-with-lease once conflicts are resolved. This approach checks commit style and ensures history edits remain traceable without accidentally overwriting remote branch updates.

How do I find when a specific change happened or who introduced a line of code?

Find when a change happened or who introduced a line using targeted git log, git blame, and git bisect guidance. This history analysis is ideal for debugging regressions or auditing contributions across collaborative codebases and modules.

Does atomic commit style detection work across different programming languages?

Atomic commit style detection works across different programming languages by analyzing recent commit logs to identify existing conventions. It applies these detected styles to new commits, ensuring consistency before rebasing or pushing to collaborative codebases.

Why should I enforce atomic commits instead of pushing single large diffs?

Enforce atomic commits instead of pushing single large diffs to prevent sprawling history and keep every feature traceable. Splitting edits per directory or revertability makes large diffs reviewable and ensures the codebase remains rebase-ready for collaborators.