Agent skill

Git Workflow

by einverne in einverne/dotfiles

Provides expert guidance on Git operations including branch management, commit best practices, merge conflicts, and version control workflows.

GPL-3.0Auto-check passedDevelopment

Install Git Workflow

skills CLI
$ npx skills add einverne/dotfiles --skill git-workflow -a claude-code

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

GitHub CLI
$ gh skill install einverne/dotfiles 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/einverne/dotfiles.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
121
Token cost
~638 tokens
SKILL.md length
253 words
Files
1
Skills in repo
39
Repo updated
First seen
Licence
GPL-3.0

At a glance

Provides expert guidance on Git operations including branch management, commit best practices, merge conflicts, and version control workflows.

  • Works in 5 steps: Branch Management → Commit Best Practices → Merge and Rebase Operations → …
  • The user needs help with Git commands
  • SKILL.md covers Core Responsibilities, Safety Principles, Common Tasks and Best Practices
  • Calls git

What it does

Git Workflow is an agent skill from einverne/dotfiles. Provides expert guidance on Git operations including branch management, commit best practices, merge conflicts, and version control workflows. Use when the user needs help with Git commands, workflows, or resolving repository issues.

Its SKILL.md is about 640 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: my personal dotfiles managed by dotbot, zinit. The licence is GPL-3.0.

When your agent uses it

  • The user needs help with Git commands
  • Resolving repository issues

Example prompts

  • “Use the git-workflow skill to provide expert guidance on Git operations including branch management, commit best practices, merge conflicts, and…”
  • “/git-workflow”

Workflow steps

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

  1. Branch Management
  2. Commit Best Practices
  3. Merge and Rebase Operations
  4. Git History Management
  5. Collaboration Workflows

What it can do on your machine

Read from SKILL.md and the folder at commit c6c0686. 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

    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 638 tokens when it runs. Until then it costs about 62 tokens; SKILL.md has 253 words of instructions outside code blocks.

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

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 passed

The automated check found no risky patterns in SKILL.md.

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 einverne/dotfiles at commit c6c0686, republished under its GPL-3.0 licence (© einverne). 253 words, ~638 tokens.

Download SKILL.mdSave it as .claude/skills/git-workflow/SKILL.md (or your agent's skills folder).
name
git-workflow
description
Provides expert guidance on Git operations including branch management, commit best practices, merge conflicts, and version control workflows. Use when the user needs help with Git commands, workflows, or resolving repository issues.

You are an expert Git workflow specialist. Your role is to help users with Git operations efficiently and safely.

Core Responsibilities

  1. Branch Management

    • Create, switch, and manage branches following naming conventions
    • Follow git-flow or GitHub flow patterns
    • Clean up stale branches
    • Manage feature, bugfix, hotfix, and release branches
  2. Commit Best Practices

    • Write clear, conventional commit messages
    • Follow format: type(scope): description
    • Types: feat, fix, docs, style, refactor, test, chore
    • Keep commits atomic and focused
    • Stage changes logically
  3. Merge and Rebase Operations

    • Safely merge branches
    • Interactive rebase for commit history cleanup
    • Resolve merge conflicts efficiently
    • Squash commits when appropriate
  4. Git History Management

    • View and analyze git log effectively
    • Search commit history
    • Identify when bugs were introduced (git bisect)
    • Cherry-pick specific commits
  5. Collaboration Workflows

    • Pull request best practices
    • Code review workflows
    • Sync with upstream repositories
    • Handle remote branch operations

Safety Principles

  • Always verify branch before destructive operations
  • Use --dry-run when available
  • Create backups before complex operations (git branch backup-YYYYMMDD)
  • Check working directory is clean before major operations
  • Verify remote before force pushing

Common Tasks

Creating Feature Branch
bash
git checkout -b feature/descriptive-name
Commit with Conventional Message
bash
git add .
git commit -m "feat(auth): add OAuth2 login support"
Interactive Rebase
bash
git rebase -i HEAD~3
Sync with Remote
bash
git fetch origin
git rebase origin/main
Conflict Resolution
  1. Identify conflicted files: git status
  2. Resolve conflicts in editor
  3. Stage resolved files: git add <file>
  4. Continue operation: git rebase --continue or git merge --continue

Best Practices

  • Commit early, commit often
  • Write meaningful commit messages
  • Keep branches short-lived
  • Regularly sync with main branch
  • Review changes before committing
  • Use .gitignore properly
  • Never commit secrets or credentials
  • Sign commits when possible (GPG)

© einverne, GPL-3.0. 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 einverne/dotfiles.

Open the folder on GitHubat commit c6c0686

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 skilleinverne/dotfiles121—~638Automated safety check: PassGPL-3.0
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 einverne/dotfiles

All 39 skills in this repo
  • DOCX

    einverne/dotfiles

    Comprehensive document creation, editing, and analysis with support for tracked changes, comments, formatting preservation, and text extraction.

    121 GitHub starsUsed in 34 repos~2.5k tokens
    Auto-check: notes
  • Chrome Devtools

    einverne/dotfiles

    Browser automation, debugging, and performance analysis using Puppeteer CLI scripts.

    121 GitHub starsUsed in 1 repo~1.6k tokens
    Auto-check: notes
  • PDF

    einverne/dotfiles

    Comprehensive PDF manipulation toolkit for extracting text and tables, creating new PDFs, merging/splitting documents, and handling forms.

    121 GitHub starsUsed in 46 repos~1.8k tokens
    Auto-check passed
  • Gemini Audio

    einverne/dotfiles

    Guide for implementing Google Gemini API audio capabilities - analyze audio with transcription, summarization, and understanding (up to 9.5 hours), plus generate speech with controllable TTS.

    121 GitHub starsUsed in 1 repo~2k tokens
    Auto-check: notes
  • Gemini Image Gen

    einverne/dotfiles

    Guide for implementing Google Gemini API image generation - create high-quality images from text prompts using gemini-2.5-flash-image model.

    121 GitHub starsUsed in 1 repo~1.8k tokens
    Auto-check: notes
  • Gemini Vision

    einverne/dotfiles

    Guide for implementing Google Gemini API image understanding - analyze images with captioning, classification, visual QA, object detection, segmentation, and multi-image comparison.

    121 GitHub starsUsed in 1 repo~1.6k tokens
    Auto-check: notes

Works with

Categories

Questions about Git Workflow

What does Git Workflow do?

Provides expert guidance on Git operations including branch management, commit best practices, merge conflicts, and version control workflows. Git Workflow is an agent skill from einverne/dotfiles. Provides expert guidance on Git operations including branch management, commit best practices, merge conflicts, and version control workflows.

When should I use Git Workflow?

Git Workflow fits situations like: the user needs help with Git commands; resolving repository issues.

How do I install Git Workflow in Claude Code?

Run `npx skills add einverne/dotfiles --skill git-workflow -a claude-code`. Or copy the skill folder (claude/skills/git-workflow in einverne/dotfiles) 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 einverne/dotfiles --skill git-workflow -a codex`. Or copy the skill folder (claude/skills/git-workflow in einverne/dotfiles) 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 einverne/dotfiles --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).

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 no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Git Workflow use?

Git Workflow is published under the GPL-3.0 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 638 tokens (SKILL.md is roughly 2.6k 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?

einverne (a GitHub user) maintains it in einverne/dotfiles, which has 121 GitHub stars. The repository holds 39 skills in this directory. The repository was last updated on September 9, 2026.

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