git-workflow

A guide for common Git tasks, including branches, commits, merging, conflict resolution, and pull-request preparation. Git is a tool for tracking code changes and collaborating with other developers.

In plain words
What is it for?
Use it when creating feature or hotfix branches, writing commits, pushing changes, resolving conflicts, merging, or following Git Flow or GitHub Flow.
Why use it?
It provides a repeatable way to handle everyday version-control work and helps keep branch and commit practices consistent.

Command for Claude Code

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 commands/justdvp/claude-code-templates/git-workflow
Clone the repo
git clone --depth 1 https://github.com/Justdvp/claude-code-templates

Made for: Claude Code.

Per session 0 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 1,264 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.00000 $0.01264
Opus 5 $0.00000 $0.00632
Sonnet 5 $0.00000 $0.00253
Haiku 4.5 $0.00000 $0.00126

Measured 2d ago against content hash c1558e977d2d, 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.

Origin

Copies of this mod

1 near-identical copy found in the catalogue:

cli-tool/templates/common/.claude/commands/git-workflow.md · 239 lines

How it starts

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

Git Workflow Helper

Manage Git workflows with best practices and common operations.

Purpose

This command helps you perform common Git operations following best practices for collaborative development.

Usage

/git-workflow

What this command does

  1. Guides through Git operations with proper workflow
  2. Suggests best practices for commits and branches
  3. Helps with conflict resolution and merging
  4. Provides templates for commit messages
  5. Manages branching strategies (Git Flow, GitHub Flow)

Common Workflows

Feature Development

# Create and switch to feature branch
git checkout -b feature/user-authentication

# Work on your feature
# ... make changes ...

# Stage and commit changes
git add .
git commit -m "feat: add user authentication system

- Implement login/logout functionality
- Add password validation
- Create user session management
- Add authentication middleware"

# Push feature branch
git push -u origin feature/user-authentication

# Create pull request (via GitHub/GitLab interface)

Hotfix Workflow

# Create hotfix branch from main
git checkout main
git checkout -b hotfix/security-patch

# Fix the issue
# ... make changes ...

# Commit the fix
git commit -m "fix: resolve security vulnerability in auth module

- Patch XSS vulnerability in login form
- Update input validation
- Add CSRF protection"

# Push and create urgent PR
git push -u origin hotfix/security-patch

Sync with Remote

# Update main branch
git checkout main
git pull origin main

# Update feature branch with latest main
git checkout feature/your-feature
git rebase main
# OR
git merge main

Commit Message Conventions

Conventional Commits Format

<type>[optional scope]: <description>

[optional body]

[optional footer(s)]

Common Types

  • feat: New feature
  • fix: Bug fix
  • docs: Documentation changes
  • style: Code style changes (formatting, etc.)
  • refactor: Code refactoring
  • test: Adding or updating tests
  • chore: Maintenance tasks

Read the full file on GitHub · 239 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 · 239 lines · 0 tokens per session scan A c1558e977d2d

Subscribe to this mod's changes

git-workflow is a command published in the GitHub repository Justdvp/claude-code-templates (7 stars, last pushed 2d ago), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 1,264 tokens. 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-31.