# Git

> Git usage patterns and conventions. Use when the user requests commits or git operations. Enforces compact commit messages (headline + 1-2 sentences), conventional commit format, no Claude annotations, and focuses on WHY not WHAT in summaries.

- **Type:** Skill
- **Install:** `agentstack add skill-pfeff-claude-skills-git`
- **Verified:** Yes — security-reviewed for prompt injection and unsafe behavior
- **Seller:** [pfeff](https://agentstack.voostack.com/s/pfeff)
- **Installs:** 0
- **Category:** [Agent Skills](https://agentstack.voostack.com/c/agent-skills)
- **Latest version:** 0.1.0
- **License:** MIT
- **Upstream author:** [pfeff](https://github.com/pfeff)
- **Source:** https://github.com/pfeff/claude-skills/tree/main/skills/git

## Install

```sh
agentstack add skill-pfeff-claude-skills-git
```

Requires the [AgentStack CLI](https://agentstack.voostack.com/docs/cli). Works with Claude Code, Cursor, and any MCP-compatible agent.

## About

# Git Skill

Encapsulates preferred git usage patterns and conventions.

## Core Principles

**Incremental Commits**: Commit at logical boundaries during implementation

| Commit when... | Don't commit when... |
|----------------|---------------------|
| Logical unit complete (model, service, component) | Small part of a larger unit |
| Tests pass + meaningful progress | Tests failing |
| About to switch contexts (backend → frontend) | Purely scaffolding with no behavior |
| About to attempt risky/uncertain changes | Would need a "WIP" commit message |

Heuristic: "Can I write a meaningful commit message? If yes, commit. If I'd write 'WIP', keep working."

**Commit Messages**: Keep compact and meaningful
- Headline + 1-2 sentence summary maximum
- Avoid duplicating what's obvious from the diff
- For bug fixes: indicate the specific bug that was fixed
- Use conventional commit format (feat, fix, refactor, docs, etc.)
- NO "Generated with Claude" or "Co-Authored-By" annotations

## Operations

### Committing Changes

**When**: User requests a commit or asks to save work to git.

**Implementation**: Load `operations/commit.md` for detailed steps.

**Quick summary**: Stage changes, craft compact commit message, create commit.

### Merging Pull Requests

**When**: User requests merging a PR, especially from a worktree context.

**Implementation**: Load `operations/merge-pr.md` for detailed steps.

**Quick summary**: Resolve merge strategy (explicit input → repo CLAUDE.md `Merge Strategy` → GitHub repo settings → default `--merge`), detect worktree context, merge without `--delete-branch` in worktrees to avoid checkout failure, delete remote branch separately.

### Submodule Workflows

**When**: Working with git submodules, especially after clone or dotfiles install.

**Implementation**: Load `operations/submodule.md` for detailed steps.

**Quick summary**: Check for detached HEAD, sync to main before making changes, commit submodule then parent.

### Creating Pull Requests

**When**: User requests a PR for the current branch.

**Implementation**: Detect PR tool based on remote origin, then use appropriate command.

**Detection**:
```bash
# Detect whether to use gh or az for PRs
tool=$(${CLAUDE_PLUGIN_ROOT}/skills/git/bin/detect-pr-tool)
```

**PR Creation by Tool**:
| Tool | Command |
|------|---------|
| `gh` | `gh pr create --title "..." --body "..."` |
| `az` | `az repos pr create --title "..." --description "..."` |

**Quick summary**: Run detect-pr-tool to determine `gh` vs `az`, then create PR with appropriate CLI.

## Commit Message Format

```
: 

```

**Types**:
- `feat`: New feature
- `fix`: Bug fix
- `refactor`: Code restructuring without behavior change
- `docs`: Documentation only
- `test`: Test additions or modifications
- `chore`: Maintenance tasks

**Examples**:

Good:
```
fix: correct AD username rendering in init script

The username variable was incorrectly escaped, causing registration failures.
```

```
feat: add OAuth2 support for API authentication

Enables token-based auth for external integrations.
```

Bad (too verbose):
```
fix: fixed the bug where the AD username was being rendered incorrectly

This commit fixes the issue where the AD username variable in the init script
was being rendered with incorrect escaping, which was causing the servers to
fail to register with Active Directory and subsequently fail all downstream
initialization steps.
```

## Progressive Disclosure

Load only what you need:

**Operations**:
- `operations/commit.md` - Commit workflow implementation
- `operations/merge-pr.md` - Worktree-aware PR merge
- `operations/submodule.md` - Submodule workflow patterns

**Scripts**:
- `bin/detect-pr-tool` - Detect `gh` or `az` based on remote origin

**Templates**:
- `templates/commit-message.tmpl` - Message structure template

## See Also

- User's global CLAUDE.md for commit conventions
- Conventional Commits specification

## Source & license

This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.

- **Author:** [pfeff](https://github.com/pfeff)
- **Source:** [pfeff/claude-skills](https://github.com/pfeff/claude-skills)
- **License:** MIT

Install and usage instructions live in the source repository linked above.

## Pricing

- **Free** — Free

## Security capabilities

Automated source analysis of v0.1.0 — what this tool can access:

- **Network access:** no
- **Filesystem access:** no
- **Shell / process execution:** no
- **Environment & secrets:** no
- **Dynamic code execution:** no

*"Yes" means the capability is present in the source — more access means more to trust, not that it is unsafe.*


## Versions

- **0.1.0** — security scan: passed — Imported from the upstream source.

## Links

- Listing page: https://agentstack.voostack.com/l/skill-pfeff-claude-skills-git
- Seller: https://agentstack.voostack.com/s/pfeff
- Browse the marketplace: https://agentstack.voostack.com/browse

---
Listed on AgentStack — the marketplace for AI agent skills and MCP servers. Every listing is security-reviewed. Creators keep 70%.