home / skills / yeachan-heo / oh-my-claudecode / git-master

git-master skill

safe

/skills/git-master

This skill helps you manage git history with atomic commits, rebasing, and branch hygiene to streamline collaboration.

npx playbooks add skill yeachan-heo/oh-my-claudecode --skill git-master

Review the files below or copy the command above to add this skill to your agents.

Files (1)

SKILL.md

523 B

---
name: git-master
description: Git expert for atomic commits, rebasing, and history management
---

# Git Master Command

Routes to the git-master agent for git operations.

## Usage

```
/oh-my-claudecode:git-master <git task>
```

## Routing

```
Task(subagent_type="oh-my-claudecode:git-master", model="sonnet", prompt="{{ARGUMENTS}}")
```

## Capabilities
- Atomic commits with conventional format
- Interactive rebasing
- Branch management
- History cleanup
- Style detection from repo history

Task: {{ARGUMENTS}}

Overview

This skill is a git expert agent that helps teams create atomic commits, perform interactive rebases, and manage repository history. It focuses on clear, conventional commit messages and safe history cleanup to keep projects maintainable. It is optimized for multi-agent workflows and codebase-aware style detection.

How this skill works

You send a concise git task and the agent routes it to a git-specialized subagent that executes planning and guidance steps. It inspects repository history, detects commit style, and proposes or applies atomic commits, rebases, branch operations, or history edits. For risky operations it recommends safe commands, steps to preview changes, and how to recover if needed.

When to use it

When you need to split large changes into atomic commits with conventional messages
When preparing a feature branch for merge and you want a clean linear history
When you must perform interactive rebases to reorder, squash, or edit commits
When cleaning up commit history before a release or public push
When detecting or enforcing commit style consistency across a repo

Best practices

Describe the desired end state and include branch names or commit SHAs when relevant
Run dry-run or --interactive preview steps before applying destructive history changes
Push rebased branches to remote with force-with-lease and notify collaborators
Keep commits focused and minimal; one logical change per commit
Back up important branches or create temporary refs before history rewrites

Example use cases

Split a large working tree change into three atomic commits with conventional messages
Interactively rebase a feature branch to remove debug commits and reorder fixes
Rewrite author info on a series of commits to correct metadata before publishing
Squash minor fix commits and reword messages to match repository commit style
Create a clean merge-base by rebasing a long-lived branch onto main and resolving conflicts

FAQ

Can the agent modify my remote branches directly?

It recommends and constructs commands but expects you to run remote pushes; for destructive operations it advises force-with-lease and collaborator coordination.

How does it ensure commit message style consistency?

It analyzes recent commit messages to infer the repo's style and suggests conventional-format messages or templates matched to that style.