# Git Workflow

> Use when committing, branching, splitting changes, managing stacks, creating worktrees, or cleaning up branches — detects Graphite or Git and guides the agent through best-practice workflows via CLI.

- Skill: `hjewkes/git-workflow` (Agent Skill, multi-file: 5 files)
- Install (CLI): `npx skillmds@latest add hjewkes/git-workflow`
- Raw SKILL.md: https://api.skillmd.com/api/skills/hjewkes/git-workflow/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: AI & ML
- Author: hjewkes (https://skillmd.com/u/hjewkes)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/hjewkes/git-workflow

---


# Git Workflow

Unified git workflow skill. Detects Graphite (`gt`) or plain Git, prefers Graphite when available.

**First step in any git operation:** Run `scripts/git-workflow status` to detect the environment.

## Quick Reference

| Situation | Action |
|-----------|--------|
| Need repo state / tool detection | `git-workflow status` |
| Ready to commit staged changes | `git-workflow commit --message "feat: ..."` |
| Large diff needs decomposition | Read [references/splitting-changes.md](references/splitting-changes.md), then `git-workflow split` |
| View or manage branch stack | `git-workflow stack` |
| Need isolated workspace | `git-workflow worktree --branch feat/name` |
| Stale local branches | `git-workflow clean` |
| Graphite command reference | [references/graphite-guide.md](references/graphite-guide.md) |
| Commit/branch conventions | [references/git-best-practices.md](references/git-best-practices.md) |

## CLI Reference

| Command | Description |
|---------|-------------|
| `git-workflow status` | Detect gt/git, report branch, dirty files, stack state |
| `git-workflow commit` | Guided commit (conventional format, gt create or git commit) |
| `git-workflow split` | Analyze diff, suggest split points, guide decomposition |
| `git-workflow stack` | Show stack state, create/restack/sync branches |
| `git-workflow worktree` | Create isolated worktree with dep install + test baseline |
| `git-workflow clean` | Remove merged/gone branches and associated worktrees |

## Workflow Integration

| Workflow | Usage |
|----------|-------|
| Feature development | `status` → work → `commit` → `stack` (if stacking) |
| Large change decomposition | `status` → read splitting-changes.md → `split` |
| Parallel agent work | `worktree` → work in isolation → finish |
| Post-merge cleanup | `clean` to remove stale branches |
| PR creation | Use `github-pr` skill after committing/pushing |

## Safety Guardrails

- Never `git push --force` to main/master
- Never `git add .` or `git add -A` (stage specific files)
- Never skip hooks with `--no-verify`
- Never `git reset --hard` without explicit user instruction
- Always verify staged files before committing

## Reference Files

| Reference | Purpose |
|-----------|---------|
| [references/graphite-guide.md](references/graphite-guide.md) | Graphite commands, stacking patterns, pitfalls |
| [references/git-best-practices.md](references/git-best-practices.md) | Commit format, branch naming, safety rules |
| [references/splitting-changes.md](references/splitting-changes.md) | Strategies for decomposing large diffs |