git-workflow

A guide to Git branching, commit messages, pull requests, and choosing between merging and rebasing. Git is a tool for tracking code changes and collaborating with others.

In plain words
What is it for?
Use it when starting features or fixes, naming branches, writing conventional commits, preparing pull requests, resolving conflicts, or managing releases.
Why use it?
Unclear branches and messy history make changes harder to review and merge. It helps keep work separated, understandable, and ready for review.

Skill for Claude CodeCodex

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/dvnghiem/flowdeck/git-workflow
Any agent
npx skills add DVNghiem/FlowDeck --skill git-workflow
Clone the repo
git clone --depth 1 https://github.com/DVNghiem/FlowDeck

Made for: Claude Code, Codex.

Per session 34 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,141 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 $0.00034 $0.01141
Opus 5 $0.00017 $0.00571
Sonnet 5 $0.00007 $0.00228
Haiku 4.5 $0.00003 $0.00114

Measured 2d ago against content hash 93f2813c6966, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, 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 2d ago.

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.

src/skills/git-workflow/SKILL.md · 178 lines

How it starts

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

Git Workflow Skill

Clean, reviewable git history. Small commits, descriptive messages, reviewed before merge.

When to Activate

Activate when:

  • Starting a new feature or bug fix
  • Creating a pull request
  • Managing a release
  • Resolving merge conflicts

Core Principles

  • Small, atomic commits — one logical change per commit
  • Descriptive messages — reader understands the change without reading the diff
  • Linear history preferred — rebase local branches before creating PR
  • Review before merge — no self-merges on shared branches

Branch Naming Convention

feature/user-authentication      — new features
fix/login-redirect-loop          — bug fixes
chore/update-dependencies        — maintenance
release/v1.2.0                   — release preparation
hotfix/critical-null-dereference — urgent production fixes
refactor/extract-auth-middleware — code restructuring
docs/update-api-reference        — documentation only

Conventional Commits Format

type(scope): description

[optional body]

[optional footer]

Types

Type Version Bump When to Use
feat minor New feature for the user
fix patch Bug fix for the user
perf patch Performance improvement
refactor patch Code change, no behavior change
docs none Documentation only
test none Adding or fixing tests
chore none Dependencies, tooling, CI
ci none CI/CD configuration
build none Build system changes

Examples

feat(auth): add JWT token refresh endpoint
fix(auth): correct token expiry off-by-one error
perf(db): replace N+1 query with single JOIN
refactor(user): extract password validation to separate module
docs(api): document authentication endpoints
test(auth): add coverage for token expiry edge cases
chore(deps): update express to 4.18.2
ci(github): add node 20 to test matrix
feat!: remove deprecated v1 API endpoints

Breaking Changes

Read the full file on GitHub · 178 lines

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. 2d ago First seen · 178 lines · 34 tokens per session scan A 93f2813c6966

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository DVNghiem/FlowDeck (24 stars, last pushed 13d ago), licensed MIT. It adds 34 tokens to every session and 1,141 once invoked, about $0.0002 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.

Related

Other skills, from other repositories

oh-my-opencode-slim

Configure and improve oh-my-opencode-slim for the current user. Use when users want to tune agents, models, prompts, custom agents, skills, MCPs, presets, or plugin behavior. Also use when recurring workflow friction suggests a safe config or prompt improvement.

alvinunreal/oh-my-opencode-slim · 61 tokens

reflect

Review recent work, find repeated workflow patterns, and suggest reusable skills, agents, commands, config changes, or playbooks. Use when the user asks to learn from past sessions, improve recurring workflows, or identify what should be turned into reusable agent instructions.

alvinunreal/oh-my-opencode-slim · 53 tokens

clonedeps

Clone important project dependency source code into an ignored local workspace so OpenCode can inspect library internals. Use when the user asks to clone dependencies, inspect dependency/source internals, understand SDK/framework behavior from source, debug library implementation details, or make core dependency repos…

alvinunreal/oh-my-opencode-slim · 76 tokens

codemap

Generate comprehensive hierarchical codemaps for UNFAMILIAR repositories. Expensive operation - only use when explicitly asked for codebase documentation or initial repository mapping.

alvinunreal/oh-my-opencode-slim · 34 tokens

deepwork

High-cost orchestrator workflow for large, high-risk, multi-phase coding efforts with meaningful dependencies and review gates. Do not activate for routine multi-file changes.

alvinunreal/oh-my-opencode-slim · 34 tokens

worktrees

Manage Git worktrees as OMO safe isolated coding lanes for complex, risky, or parallel work.

alvinunreal/oh-my-opencode-slim · 23 tokens