Branch Discipline

Enforce one branch per issue, small focused commits, and clean git history. Use with /branch command.

8 stars 3 forksGit & Code Review Plugin marketplace

Install

Claude Code plugin
/plugin marketplace add Freddy-CHEN-ux/00_claude_skills

The repo is a Claude Code plugin marketplace. Run /plugin afterwards to pick the plugin that includes this skill.

skills CLI (Claude Code, Cursor, Codex and more)
npx skills add Freddy-CHEN-ux/00_claude_skills --skill branch-discipline
Manual install
git clone --depth 1 https://github.com/Freddy-CHEN-ux/00_claude_skills.git /tmp/00_claude_skills
mkdir -p ~/.claude/skills
cp -r /tmp/00_claude_skills/skills/branch-discipline ~/.claude/skills/branch-discipline

Personal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.

From the SKILL.md

# Branch Discipline

Principles for clean git history: one issue per branch, small commits, clear scope.

## Core Principles

### 1. One Branch = One Issue

Every branch addresses exactly ONE issue, feature, or bug fix.

```
✓ feature/123-fix-login-validation
✓ feature/456-add-user-export
✗ feature/misc-fixes              # Too vague
✗ feature/login-and-export        # Two issues
```

### 2. Small, Logical Commits

Each commit is a single logical change that could be reverted independently.

```
✓ "fix(#123): validate email format"
✓ "fix(#123): add error message for invalid email"
✓ "test(#123): add email validation tests"

✗ "fix stuff"
✗ "WIP"
✗ "fix login, add export, refactor auth"
```

### 3. Scope Discipline

If you find another issue while working:
1. **STOP** - don't fix it in this branch
2. **NOTE** - add to issue tracker or notes
3. **BRANCH** - create a separate branch later

```
Working on #123 (login validation)
Found #789 (password reset bug)

✗ Fix both in same branch
✓ Note #789, continue with #123, branch for #789 later
```

### 4. Worktrees for Parallel Work

Use git worktrees when you need to:
- Work on multiple issues simultaneously
- Context switch without stashing
- Run parallel agent tasks

```bash
# Main repo stays on main
/project/              # main branch

# Each issue gets its own worktree
/project-123/          # feature/123 branch
/project-456/          # feature/456 branch
```

## Workflow

### Starting Work
Read the full skill on GitHub

Details

Skill name
branch-discipline
Path
skills/branch-discipline/SKILL.md
Repo updated
10 January 2026

FAQ

What does the Branch Discipline skill do?

Enforce one branch per issue, small focused commits, and clean git history. Use with /branch command.

How do I install the Branch Discipline skill?

Claude Code plugin: /plugin marketplace add Freddy-CHEN-ux/00_claude_skills. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.

Is Branch Discipline popular?

It lives in Freddy-CHEN-ux/00_claude_skills, which has 8 GitHub stars and 3 forks.

Related skills

Add Integration

8

Freddy-CHEN-ux/00_claude_skills

Build a new API integration for Nexus. Load when user mentions "add integration", "new integration", "integrate with", "connect to [service]", or "build [service] integration". Interactive workflow that discovers API endpoints, plans the integration, and creates a project for implementation.

Software Development

AI Agents

8

Freddy-CHEN-ux/00_claude_skills

Production-grade AI agent patterns with MCP integration, agentic RAG, handoff orchestration, multi-layer guardrails, and observability (modern best practices)

AI, LLMs & Agents

AI LLM

8

Freddy-CHEN-ux/00_claude_skills

Production LLM engineering skill. Covers strategy selection (prompting vs RAG vs fine-tuning), dataset design, PEFT/LoRA, evaluation workflows, deployment handoff to inference serving, and lifecycle operations with cost/safety controls.

AI, LLMs & Agents

Continuous Delivery

5

vnovakovits/claude-skills

Apply Jez Humble and David Farley's Continuous Delivery — the discipline of making software always release-ready through deployment pipelines, trunk-based development, automated everything, feature flags, branch-by-abstraction, and the four DORA metrics (deployment frequency, lead time, change failure rate, mean time to restore). Use when designing a deployment pipeline, choosing a branching strategy, debating long-lived feature branches vs. trunk-based, deciding how to deploy in-flight changes safely, or evaluating delivery health.

Git & Code Review

Verify Heading

9

Lord1Egypt/RA-Skills

Fetches https://example.com and verifies its main <h1> reads 'Example Domain'. Minimal end-to-end smoke test using the Browserbase Fetch API.

Git & Code Review

File Validation

8

Freddy-CHEN-ux/00_claude_skills

Strict detection and removal of unrelated files before PR creation

Git & Code Review

Browse the most popular Claude skills, all git & code review skills, or write your own with the skills generator.