Agent skill

Git Workflow

by extra-org in extra-org/extra

Work safely with Git — keep changes scoped and reviewable, never overwrite the user's work, and produce clear history.

MITAuto-check: notesDevelopment

Install Git Workflow

skills CLI
$ npx skills add extra-org/extra --skill git-workflow -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install extra-org/extra git-workflow --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/extra-org/extra.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.claude/skills/git-workflow .claude/skills/git-workflow && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
git-workflow
GitHub stars
113
Token cost
~781 tokens
SKILL.md length
367 words
Files
1
Skills in repo
14
Repo updated
First seen
Licence
MIT

At a glance

Work safely with Git — keep changes scoped and reviewable, never overwrite the user's work, and produce clear history.

  • Works in 5 steps: Inspect: git status and git diff (and… → Scope the change to the current task;… → Stage deliberately (git add ) — review… → …
  • Tasks that involve Git workflow
  • SKILL.md covers Purpose, When to Use This Skill, Files to Read First and Core Principles, plus 5 more sections
  • Calls git and make

What it does

Git Workflow is an agent skill from extra-org/extra. Work safely with Git — keep changes scoped and reviewable, never overwrite the user's work, and produce clear history. Use before editing, branching, staging, or committing.

Its SKILL.md is about 780 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: Turn your product into an AI-powered assistant. The licence is MIT.

When your agent uses it

  • Tasks that involve Git workflow

Example prompts

  • “/git-workflow”

Workflow steps

5 steps, taken from the first numbered list in SKILL.md.

  1. Inspect: git status and git diff (and git log --oneline -5 for
  2. Scope the change to the current task; keep unrelated edits out.
  3. Stage deliberately (git add ) — review what's staged; ensure no
  4. Commit when asked, using the format below and a HEREDOC for the message.
  5. Summarize the modified files in your final response.

What it can do on your machine

Read from SKILL.md and the folder at commit 023b0a0. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git
    • make

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Git Workflow loads about 781 tokens when it runs. Until then it costs about 47 tokens; SKILL.md has 367 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~47
When it runs · the whole SKILL.md, loaded when a task matches
~781

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check: notes

The automated check noted patterns worth knowing about, such as sudo or a known installer.

  • NoteMentions a .env fileSKILL.md:42
    - **No secrets.** Never stage `.env`, credentials, or large binaries.
  • NoteMentions a .env fileSKILL.md:71
    - [ ] No secrets, `.env`, or large binaries staged.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from extra-org/extra at commit 023b0a0, republished under its MIT licence (© extra-org). 367 words, ~781 tokens.

Download SKILL.mdSave it as .claude/skills/git-workflow/SKILL.md (or your agent's skills folder).
name
git-workflow
description
Work safely with Git — keep changes scoped and reviewable, never overwrite the user's work, and produce clear history. Use before editing, branching, staging, or committing.
generated
true
source
.ai/skills/git-workflow.md
<!--
This file is generated by tools/skills.
Do not edit this file directly.
Edit .ai/skills/git-workflow.md and run `make generate-ai`.
-->

Skill: Git Workflow

Purpose

Work safely with Git: keep changes scoped and reviewable, never overwrite the user's work, and produce clear history.

When to Use This Skill

  • Before editing files (inspect current state first).
  • Branching, staging, or committing.
  • Preparing a change set or pull request for review.

Files to Read First

  • AGENTS.md (git safety + scope rules).
  • docs/DEVELOPMENT_WORKFLOW.md.
  • The current diff/status of the repository.

Core Principles

  • Inspect before editing. Run git status and git diff to understand uncommitted work; never clobber the user's changes.
  • Keep changes scoped to one task; avoid massive unrelated diffs.
  • Don't reformat or move files outside scope.
  • Commit only when asked. Do not auto-commit; never force-push shared branches or skip hooks.
  • Clear messages. Use a conventional, scoped commit style.
  • No secrets. Never stage .env, credentials, or large binaries.

Process

  1. Inspect: git status and git diff (and git log --oneline -5 for message style). Note any pre-existing uncommitted work to preserve.
  2. Scope the change to the current task; keep unrelated edits out.
  3. Stage deliberately (git add <paths>) — review what's staged; ensure no secrets or ignored files sneak in.
  4. Commit when asked, using the format below and a HEREDOC for the message.
  5. Summarize the modified files in your final response.
Show full SKILL.md (161 more words)Show less

Commit message format

Use a conventional prefix:

  • feat: a new feature/capability
  • fix: a bug fix
  • refactor: behavior-preserving restructuring
  • docs: documentation only
  • test: tests only
  • chore: tooling/config/housekeeping

Example: docs: consolidate agent instructions under .ai/

Checklist Before Finishing

  • Inspected git status/git diff before editing; no user work clobbered.
  • Change is scoped to one task; no unrelated churn.
  • No secrets, .env, or large binaries staged.
  • Commit message (if committing) uses the conventional format.
  • Only committed because the user asked.
  • Modified files summarized in the final response.

Common Mistakes to Avoid

  • Editing without first checking for uncommitted user work.
  • Sweeping reformat/rename diffs mixed with logic changes.
  • Committing secrets or ignored files.
  • Auto-committing when not asked, or force-pushing shared branches.
  • Vague commit messages with no scope/prefix.

Expected Final Report

State: the result of the pre-edit inspection; the list of modified/created files and how they map to the task; whether a commit was made (and its message); and confirmation that no secrets or out-of-scope changes were included.

© extra-org, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in .claude/skills/git-workflow of extra-org/extra.

Open the folder on GitHubat commit 023b0a0

Compare with similar skills

Git Workflow next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Git Workflow compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Git Workflow this skillextra-org/extra113—~781Automated safety check: NotesMIT
Finishing a Development Branchobra/superpowers296k5 repos~1.9kAutomated safety check: PassMIT
Code Design Rationale Investigatorcursor/plugins10k9 repos~2.6kAutomated safety check: PassNone
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Migrate Internal Package into GhostTryGhost/Ghost55k—~3.8kAutomated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0

Similar skills

  • Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    296k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed
  • Official

    Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.

    10k GitHub starsUsed in 9 repos~2.6k tokens
    DevelopmentAuto-check passed
  • Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed
  • Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.

    55k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed
  • Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed
  • Git Merge Conflict Resolver

    tailcallhq/forgecode

    Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.

    7.6k GitHub starsUsed in 1 repo~4.5k tokens
    DevelopmentAuto-check passed

More from extra-org/extra

All 14 skills in this repo
  • Testing

    extra-org/extra

    How to write and run fast, deterministic, behavior-focused pytest tests that never touch real external systems.

    113 GitHub stars~1.2k tokensUpdated 1 mo ago
    Auto-check passed
  • Architecture Review

    extra-org/extra

    Guard the project's architecture invariants. An agent skill from extra-org/extra.

    113 GitHub stars~1.1k tokensUpdated 1 mo ago
    Auto-check passed
  • Documentation

    extra-org/extra

    Keep the repository's documentation accurate, honest, and synchronized with the code.

    113 GitHub stars~848 tokensUpdated 1 mo ago
    Auto-check passed
  • The standard for writing Python here — small, typed, explicit, testable modules with side effects pushed to the edges.

    113 GitHub stars~1.4k tokensUpdated 1 mo ago
    Auto-check passed
  • Skill Authoring

    extra-org/extra

    How to create or restructure a skill so the .ai/skills/ system stays consistent, operational, and trustworthy.

    113 GitHub stars~1k tokensUpdated 1 mo ago
    Auto-check passed
  • Code Review

    extra-org/extra

    Senior-level code review for the agent platform — architecture and boundaries first, then correctness, security, testability, and simplicity.

    113 GitHub stars~1.3k tokensUpdated 1 mo ago
    Auto-check passed

Works with

Categories

Questions about Git Workflow

What does Git Workflow do?

Work safely with Git — keep changes scoped and reviewable, never overwrite the user's work, and produce clear history. Git Workflow is an agent skill from extra-org/extra. Work safely with Git — keep changes scoped and reviewable, never overwrite the user's work, and produce clear history.

When should I use Git Workflow?

Git Workflow fits situations like: tasks that involve Git workflow.

How do I install Git Workflow in Claude Code?

Run `npx skills add extra-org/extra --skill git-workflow -a claude-code`. Or copy the skill folder (.claude/skills/git-workflow in extra-org/extra) into .claude/skills/git-workflow in your project. Claude Code loads it when a task matches its description.

How do I install Git Workflow in Codex?

Run `npx skills add extra-org/extra --skill git-workflow -a codex`. Or copy the skill folder (.claude/skills/git-workflow in extra-org/extra) into .agents/skills/git-workflow in your project. Codex loads it when a task matches its description.

Can I use Git Workflow in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add extra-org/extra --skill git-workflow -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/git-workflow, .gemini/skills/git-workflow, .github/skills/git-workflow and .opencode/skills/git-workflow in your project.

What does Git Workflow need to run?

Going by SKILL.md and its folder, Git Workflow needs the command-line tools its instructions call (git and make).

Does Git Workflow access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Git Workflow safe to install?

Our automated static check of SKILL.md found notes only (mentions a .env file), nothing it rates as a warning. It is not a guarantee. Review the folder before installing.

What licence does Git Workflow use?

Git Workflow is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Git Workflow use?

About 781 tokens (SKILL.md is roughly 3.1k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Git Workflow?

Skills that share tags, products or a category with Git Workflow: Finishing a Development Branch (obra/superpowers, 296k stars), Code Design Rationale Investigator (cursor/plugins, 10k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 55k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Git Workflow?

extra-org (a GitHub organization) maintains it in extra-org/extra, which has 113 GitHub stars. The repository holds 14 skills in this directory. The repository was last updated on September 7, 2026.

Source: extra-org/extra on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.