skills.rest
b0nsu
b0nsuCOMMUNITY
Explore all skills by this author →
GitHub

git-master

Enforce atomic commits, safe rebases, and precise history searches across multi-directory git projects.

Updated Aug 23, 2026
Search Tags:#git#rebase#squash#bisect#atomic-commits#blame#history-search
One-click install
npx skills add https://github.com/b0nsu/oh-my-shit-memory --skill git-master-b0nsu
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-master
Source: https://github.com/b0nsu/oh-my-shit-memory/tree/main/src/features/builtin-skills/git-master
Command: npx skills add https://github.com/b0nsu/oh-my-shit-memory --skill git-master-b0nsu

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Managing git histories and collaboration on large codebases is easy to break with non-atomic commits, messy histories, and unsafe rewrites. The Git Master Agent enforces disciplined git workflows, enabling atomic commits, safe rebase/squash, and reliable history searches.

Core Features & Use Cases

  • Atomic Commit Architecture: ensures changes are split by directory or concern into atomic commits.
  • Rebase Surgeon: performs history rewriting, conflict resolution, and branch cleanup.
  • History Archaeologist: locates when and where changes were introduced using blame, log, and bisect.
  • Guardrails and mode awareness: automatically detects operation mode (commit, rebase, history search) to guide actions and prevent unsafe pushes.

Quick Start

Use the Git Master Agent to perform atomic commits, rebase/squash, and precise history searches.

Frequently Asked Questions about git-master

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

FAQPage Schema
How do I split changes across multiple directories into atomic git commits?▼

By splitting changes by directory or concern into atomic commits, you ensure commit granularity and test pairing. This approach yields maintainable history and reliable changelog generation across multi-directory projects.

What is the best way to perform a git rebase and squash without breaking history?▼

Performing history rewriting with built-in guardrails prevents unsafe pushes during git rebase and squash. This approach ensures safe conflict resolution and branch cleanup while maintaining a disciplined history.

How can I use git bisect and blame to search project history for when a change was introduced?▼

You can use git bisect and blame to locate exactly when and where changes were introduced. This history search mechanism combines log analysis with blame data to precisely trace modifications across multi-directory projects.

How do I prevent unsafe git pushes during complex history rewriting workflows?▼

You prevent unsafe git pushes during history rewriting by using operation mode awareness that detects commit, rebase, and history search contexts. This mechanism enforces guardrails automatically, blocking destructive actions before they reach the remote.

Does this git workflow tool support multi-directory projects and changelog generation?▼

Yes, this git workflow tool explicitly supports multi-directory projects by splitting changes by directory into atomic commits. This multi-directory support enables reliable changelog generation and easier collaboration across large codebases.

When should I avoid using git rebase for history rewriting in a collaborative codebase?▼

You should avoid git rebase for history rewriting in collaborative codebases when operation mode awareness cannot enforce guardrails to prevent unsafe pushes. Without these guardrails, history rewriting risks breaking shared branches and complex multi-directory workflows.

Related Skills

Explore More Software Engineering Skills→
hackefellerhackefeller
1

git-master

Manage Git repositories with atomic commits, rebasing, squashing, and history search.

Official
Advanced
ThomashighbaughThomashighbaugh
1

changelog-generator

Generate structured Markdown release notes from categorized git commit histories.

Community
Intermediate
zizzfizzixzizzfizzix

code-review

Automate code review for architectural, security, and quality compliance.

Community
Advanced
chanhee-kangchanhee-kang
2

git-master

Split and reorder Git commits into atomic changes with safe rebasing.

Community
Basic