git-workflow

git-workflow is a skill for Claude Code from EliasOulkadi/shokunin. It costs 107 tokens per session (2,342 once invoked), scanned A, original, MIT.

A guide for managing the Git development workflow, including branches, commits, rebasing, pull requests, merges, cleanup, and worktrees. Git is a version-control system that records code changes and supports collaboration.

In plain words
What is it for?
Use it to create named feature or fix branches, make conventional commits, rebase or squash history, draft pull-request descriptions, clean up branches, and work in separate Git worktrees.
Why use it?
It gives changes a consistent structure and makes their history easier to understand. It also helps reduce clutter from temporary branches and combine related work safely.

Skill for Claude Code

Written for Claude Code: allowed-tools in frontmatter. Also seen: mentions OpenCode.

Needs its repository: it reads a path above its own folder, which exists only inside the repository. The line is git worktree add ../project-feat-auth feat/add-user-auth.

Install

Getting it into your agent

It runs from inside its repository, so the clone comes first — what it calls does not travel with the file alone.

Clone the repo
git clone --depth 1 https://github.com/EliasOulkadi/shokunin
agentmods
npx agentmods add skills/eliasoulkadi/shokunin/git-workflow

Made for: Claude Code.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for git-workflow

README.md
[![agentmods](https://agentmods.dev/badge/skills/eliasoulkadi/shokunin/git-workflow.svg)](https://agentmods.dev/skills/eliasoulkadi/shokunin/git-workflow)
Your own site
<a href="https://agentmods.dev/skills/eliasoulkadi/shokunin/git-workflow"><img src="https://agentmods.dev/badge/skills/eliasoulkadi/shokunin/git-workflow.svg" alt="Measured on agentmods" height="20"></a>
Per session 107 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 2,342 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00107 $0.02342
Opus 5 $0.00053 $0.01171
Sonnet 5 $0.00021 $0.00468
Haiku 4.5 $0.00011 $0.00234

Measured 6d ago against content hash 8186dcfc10cd, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-06, from the pricing page.

Security

Grade A, and why

git-workflow scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 6d ago.

The scan reads SKILL.md. This mod also ships 4 executable files (scripts/auto-commit.ps1, scripts/cleanup-branches.ps1, scripts/create-feature-branch.ps1, …), listed below but not scanned — reading those needs a real analyzer, not pattern matching.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.pack/skills/git-workflow/SKILL.md · 264 lines

How it starts

The opening of the file, as written. The whole thing — 264 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Git Workflow

Automate the development cycle: branch, commit, PR, review, merge, cleanup. Follows conventional commits and trunk-based development.

Workflow

Step 1: Create a feature branch

scripts/create-feature-branch.ps1 -Name "add-user-auth" -Type feat

This:

  1. Detects default branch (main/master)
  2. Fetches and pulls latest
  3. Creates feat/add-user-auth from base
  4. Pushes upstream with tracking

Branch naming:

Type Prefix Example
Feature feat/ feat/add-user-auth
Fix fix/ fix/login-redirect
Docs docs/ docs/api-readme
Refactor refactor/ refactor/auth-middleware
Chore chore/ chore/update-deps

Step 2: Make atomic commits

scripts/auto-commit.ps1 -Scope "auth" -DryRun  # Preview first
scripts/auto-commit.ps1 -Scope "auth"           # Commit

The script analyses changed files, generates a conventional commit message, and stages+commits.

Conventional commit format:

<type>(<scope>): <description>

[optional body]

[optional footer]

Rules:

  • One logical change per commit
  • Description: imperative mood, lowercase, max 72 chars
  • Scope: the module/area affected
  • Footer: BREAKING CHANGE:, Closes #123, Co-authored-by:

Step 3: Prepare for PR

# Interactive rebase (squash WIP commits)
git rebase -i main

# Generate PR body from commit history
scripts/pr-body.ps1 -Clipboard

The PR body script:

  1. Detects base branch
  2. Extracts commits since fork
  3. Groups by conventional commit type
  4. Generates ## Summary, ## Changes, ## Testing sections
  5. Copies to clipboard

Squash rules:

  • Squash fixup! and wip commits
  • Keep meaningful commit history
  • Never squash if commits have different scopes
  • Use git rebase -i main with fixup (f) for WIP commits

Step 4: Create PR

# Create PR with generated body
gh pr create --title "feat(auth): add user authentication" --body "$(Get-Clipboard)"

# Or use the file
gh pr create --title "feat(auth): add user authentication" --body-file .pr-body.md

Read the full file on GitHub · 264 lines

Files

What ships with it

6 files beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 6d ago First seen · 264 lines · 107 tokens per session scan A 8186dcfc10cd

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository EliasOulkadi/shokunin (113 stars, last pushed 1mo ago), licensed MIT. It adds 107 tokens to every session and 2,342 once invoked, about $0.0005 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.