Git Workflow Assistant Agent Skill

General git workflow assistant covering commit message writing, branching strategy, rebasing vs merging, pushing, PR/MR descriptions, and…

Context cost
9.2k tokensestimated from the bundle, loaded when it triggers
Bundle
1 file · 36.9 kBtext throughout, nothing executable
Licence
not declarednone named by its author
Last change
—no release on file
Servers it uses
Noneruns standalone

What it does

General git workflow assistant covering commit message writing, branching strategy, rebasing vs merging, pushing, PR/MR descriptions, and merge conflict resolution. Includes safety checks: secret scanning before commit, stash protection before syncing, safe force-pushes, and conflict-marker verification. Use whenever the user asks to commit changes, write a commit message, create or name a branch, check if a branch is up to date, push a branch, decide between rebase/merge, squash commits, prepare a pull request description, or resolve a merge/rebase conflict.

What this skill changes about the agent has not been set out here as a list. Its SKILL.md, shown below, says it in the author’s own words.

developer toolsgitwriting

The skill itself

A skill is instructions the model reads, so you can see what you are getting: below is the start of its SKILL.md. The front matter loads with every session, the body loads when the skill triggers, and the whole file comes with the install.

SKILL.md36.9 kB · preview
--- name: git-workflow ---
30# Git Workflow Assistant
31
32> **Read this entire file before running any command from it.** This file is long by design — every section exists because of a real failure mode, including one where a partial read of this exact file (a 50-line truncation that cut off mid–Section 1) caused a commit to go out without fetching first. If the tool reading this file applies a default line or token limit, re-read with that limit raised or removed before acting. Do not treat a partial read as sufficient just because it reached a numbered step that looked like an instruction to act on — Sections 2, 6, 9, 10, and 11 contain hard gates that a truncated read will never see.
33
34## Scope and ground rules
35
36This skill handles git mechanics — inspecting diffs, staging, drafting commit messages, pushing, and resolving conflicts. It does **not** rewrite or "clean up" the substantive content of the file(s) being committed as a side effect of a git task. If something about a file's content looks off while running this workflow (a false-positive scan hit, a stray line, anything), say so and ask the user — an unrequested edit is itself the kind of mistake this skill exists to prevent, not a fix for one.
37
38**If an edit happens anyway and needs to be undone**: undo only that specific edit, using the same mechanism used to make it (the edit tool, not git). Do NOT reach for git checkout -- <file>, git restore <file>, or git reset --hard as the "undo" — those reset the file to its last *commit*, discarding every uncommitted change in it, not just the one being undone. If the file had other legitimate uncommitted work before the mistake, that work is destroyed too, and — per Section 10 — nothing that was never staged or committed can be recovered from git reflog or git fsck. This is the exact trap Section 11 warns the user about; it applies with equal force here, to the assistant's own actions.
39
40**Snapshot before touching a dirty file**: before this workflow writes to any file that git status already shows as modified, capture its current content or diff first (keep it in context, or copy it to a scratch path). That's what makes a precise undo possible later, instead of falling back on a git command whose blast radius is "everything uncommitted in this file."
41
42## 1. Before committing or pushing: check branch is up to date
43
44Always run this check before staging a commit or pushing, so stale local state — and a stale view of what teammates have done — doesn't cause surprises later.
45
46**Never treat git status's "up to date with origin/..." message as sufficient by itself.** That message reflects state as of the last fetch — which could be minutes or days old — not the live remote. Seeing it say "up to date" is not evidence of anything current; only a git fetch origin run immediately beforehand actually is. Skipping the fetch because status already looked fine is the single most common way this entire check gets accidentally bypassed — treat "fetch first, every time" as non-negotiable, not conditional on how confident the cached status looks, and not skippable just because the push is likely to be small or the user seems in a hurry.
47
48On a shared project, there are **two independent things that can be behind**, and having one doesn't mean you can skip checking the other:
This is a preview of SKILL.md. Download or install the skill to get the whole thing.
In the file
SKILL.md5,998 words
Files1
Licencenot declared
Why you can read it

Nothing in a skill executes. The client loads the text and the model follows it, so a skill can be audited the way a runbook is — by reading it.

What it costs in context

Skills are not billed by the call. They are paid for in context: every token the instructions occupy is a token your code, your diff and your conversation cannot use. Here is what this one takes and when it takes it.

≈470
always loaded
The name and description, so the model knows the skill exists and when to reach for it.
8,755
on trigger
The instruction body, read only when the skill fires.
4.6%
of a 200k window
Ten skills this size would take about 46% of the window before you open a file.
050k100k150k200k context window

9.2k tokens, estimated from the bundle at four bytes to the token, held for the rest of the session once it triggers. Heavy. Teams tend to install this one per project rather than globally, and load it only when the job comes up.

Servers bill, skills cost

A server charges by the month. A skill charges once per session, in context, and then keeps charging it for as long as the session lives.

Before and after

The same question, put to the same model twice: once as it comes, and once with these instructions loaded.

No worked example has been published for this skill yet.

The procedure it runs

The procedure has not been set out here step by step. It is in the body of its SKILL.md: the start of it is shown above, and the whole file comes with the install.

Prose, not code

These steps are written for a model to follow, not executed by a runtime. It can still be told to skip one, and it will say so when it does.

Servers it uses

None. This skill calls no MCP servers at all.

Everything it needs is in the instructions, so it works in a project with nothing connected — the model reads the file and changes how it works with what it can already reach.

Its SKILL.md does not declare which tools it asks the agent for, so what it touches is whatever the instructions themselves ask for — read them before you install it.

What it asks for
Writes filesnot declared
Network accessnot declared

This SKILL.md carries no allowed-tools line, so neither is declared. A skill grants no permissions of its own — it can only ask for tools your client already has.

What it will not do

Every skill is narrow, and the useful ones say where they stop. These are the jobs this one is the wrong tool for.

What this skill is not for has not been published here. Nothing is implied by that: it is a section the author has not filled in.

What is in the bundle

1 file, 36.9 kB on disk. A bundle is text throughout: the instructions the model reads, plus the templates it fills in.

  • SKILL.md36.9 kB
What is not in it

No dependencies and nothing executable: a skill is text the agent reads, so the bundle is 1 file you can review in full before installing.

Install

Installing copies the bundle into your project. Nothing runs at install time — the files sit on disk until the model reads them.

# Git Workflow Assistant · 9.2k tokens when loaded · macOS, Linux mkdir -p .claude/skills && t=$(mktemp -d) && curl -fsSL -o "$t/bundle.tar.gz" https://mcprush.com/api/skills/git-workflow-assistant/bundle.tar.gz && tar -xzf "$t/bundle.tar.gz" -C "$t" && [ -d "$t/git-workflow-assistant" ] && { [ ! -e .claude/skills/git-workflow-assistant ] || { mv .claude/skills/git-workflow-assistant "$t/.previous" && echo "Previous copy moved to $t/.previous"; }; } && mv "$t/git-workflow-assistant" .claude/skills/ && echo "Installed .claude/skills/git-workflow-assistant"
On Windows, or any OS with Node 20+
npx mcprush@latest skill add aadish0day/git-workflow-assistant

Windows PowerShell says 'running scripts is disabled on this system'? Run Set-ExecutionPolicy -Scope CurrentUser RemoteSigned once, or type npx.cmd instead of npx (codex.cmd, gemini.cmd, grok.cmd likewise). PowerShell 7 needs neither. Writes to .claude/skills/git-workflow-assistant/ in the current project. For every project instead, run mkdir -p ~/.claude/skills && t=$(mktemp -d) && curl -fsSL -o "$t/bundle.tar.gz" https://mcprush.com/api/skills/git-workflow-assistant/bundle.tar.gz && tar -xzf "$t/bundle.tar.gz" -C "$t" && [ -d "$t/git-workflow-assistant" ] && { [ ! -e ~/.claude/skills/git-workflow-assistant ] || { mv ~/.claude/skills/git-workflow-assistant "$t/.previous" && echo "Previous copy moved to $t/.previous"; }; } && mv "$t/git-workflow-assistant" ~/.claude/skills/ && echo "Installed ~/.claude/skills/git-workflow-assistant" (macOS, Linux) — or add --global to the npx line. The curl line replaces .claude/skills/git-workflow-assistant/ only after the download succeeds, so files left there by another skill of the same name, or by an older release, do not mix in. A copy already there is moved aside, not deleted, and the line prints where. It appears as git-workflow in Gemini CLI, Codex, Copilot and Grok (its own name); Claude Code lists it by the folder name, git-workflow-assistant.

Which clients pick it up on their own

A skill is a folder of text. Most of these read a skills folder and pick it up without being told; the rest take the same folder another way — an upload in the app, a parameter on an API call — and then choose it by its description just the same.

Claude Code.claude/skills/
Claude DesktopCustomize › Skills
ChatGPTSkills › Create › Upload
Cursor.cursor/skills/
VS Code.github/skills/
Codex CLI.agents/skills/
Gemini CLI.gemini/skills/
Grok Build.grok/skills/
Microsoft CopilotSkills › Upload a skill
PerplexityComputer › Skills › Upload a skill
DeepSeek Harness.dsh/skills/
Zed.agents/skills/
Devin Desktop.devin/skills/
Windsurf (legacy).windsurf/skills/
OpenAI Agents SDKInstructions or sandbox Skills
HTTP / APIa request parameter
This release
Versionnot versioned
Publishedno release date on file
PriceFree
Referenceaadish0day/git-workflow-assistant

Versions

Its author publishes no version number, so there is nothing here to pin to: what you install is the folder as it stands today. Instructions change more often than APIs do — a skill can be rewritten entirely without anything it depends on moving.

Pinning

Nothing to pin to: this skill carries no version number of its own. What you install is what the folder holds on the day you install it.

Reviews

—no reviews yet

Nobody has reviewed this skill yet. The rating is the mean of the reviews written here, so there is none until somebody writes the first.

Sign in to review it

A review is tied to an account so it can be answered, edited and taken down by the person who wrote it.

Sign in
Who can post

Anybody with an account, one review each. It carries the version that was current when you wrote it, and the publisher may reply once.

Publisher
Servers0
Claim this skill