Skip to main content
skill CX Codex

git-workflow · akillness — Claude Code skill: what it does, how to install

A skill for safer local Git work: branch cleanup, commit edits, conflict handling, history recovery, and review-ready diffs.

Install into Claude Code · Skills CLI (Vercel) All methods and platforms ↓
npx skills add akillness/jeo-skills --skill git-workflow -a claude-code
Open on GitHub

What git-workflow does

git-workflow inspects the local repository situation and routes the task into one focused path: branch preparation, commit cleanup, syncing with a base branch, conflict handling, push safety, or recovery. It helps choose between merge and rebase, stage selected changes, and prepare a cleaner review diff.

Before risky operations, the skill checks the current branch, worktree, and recent history. Rewritten branches use git push --force-with-lease, while shared history is undone with git revert; recovery can use git reflog and a rescue branch. The skill is intended for a working Git CLI and local repository state, not hosted PR workflows, repository administration, or sprint planning.

What it helps with

  • prepare a branch for review
  • split changes into cleaner commits
  • choose merge or rebase for a branch update
  • resolve a local Git conflict
  • recover a commit after reset or rebase

Example prompts for the agent

  • Inspect my branch and tell me the safest next step before review.
  • I ran reset --hard by mistake; help me recover the missing commit.
  • I rebased this branch; prepare a safe push for the rewritten history.

How to install git-workflow

1Skills CLI (Vercel)

npx skills add akillness/jeo-skills --skill git-workflow -a claude-code

2Manually: put the files in place

~/.claude/skills/git-workflow/SKILL.md

Copy the whole skill folder; for one project use .claude/skills/git-workflow/

Step by step, with commands for each platform: How to install skills in Claude Code: five ways

Questions about git-workflow

How do I install git-workflow in Claude Code?

Run npx skills add akillness/jeo-skills --skill git-workflow -a claude-code, then check ~/.claude/skills/git-workflow/SKILL.md.

What does git-workflow do?

It routes local Git tasks involving branches, staging, commits, synchronization, conflicts, rewritten pushes, and recovery into a safer next step.

Does git-workflow require the Git CLI?

Yes. It is designed for cases where the Git CLI is available and the issue concerns local repository state.

Similar skills

All skills for Git and GitHub →

git-workflow by other authors comes first.

git-workflow affaan-m A skill that hands your agent Git conventions: which branching strategy to pick, how to word commits, and when rebase beats merge. CX Codex +1 5,000installs git-workflow agno-team A skill that enforces best practices for commits, branch names, and pull requests. Includes commit message validation, branch naming templates, and PR checklist structure — useful if your team has git standards. CX Codex +1 665installs git-workflow ruvnet A skill that walks branches, conflicts and the pull request lifecycle, with a diff-risk score before every merge. CX Codex +1 743installs git-workflow Galaxy-Dawn Enforces Git standards: Conventional Commits, branch naming, no-ff merge flows, and conflict resolution. Useful for teams needing consistent version control habits. CX Codex +1 374installs git-workflow jezweb Guides Git work for pull requests, merged-branch cleanup, conflict resolution, and monorepo release tags in Claude Code. CX Codex +1 1,200installs spatie-version-control Spatie A skill that hands your agent Spatie's rules for commits, branches and pull requests. Useful once the agent starts committing and branching on its own. CX Codex +1 480installs git-workflow-and-versioning addyosmani A skill that tells your agent how to use git: atomic commits, short-lived branches, worktrees for parallel tasks. Useful when AI writes code faster than you can review it. CX Codex +1 59,500installs git-notes NeoLabHQ Attaches notes to commits without touching their SHA. Useful for marking reviews, test results or adding context after the fact. CX Codex +1 1,100installs here-be-git intellectronica Runs git init in the current folder, optionally adds agent commit rules to AGENTS.md, and writes a .gitignore. CX Codex +1 527installs git-rebase Pedro Nauck Walks an agent through a rebase and settles conflicts commit by commit, leaving unrelated work alone. Useful when a branch has fallen behind its base. CX Codex +1 376installs git-workflow-strategy aj-geddes A skill that helps your agent pick a branching model and walk a feature, release or hotfix through the right steps. Useful when the team has no shared branch rules. CX Codex +1 482installs

From the same set46

state-management A skill that classifies React state into packets and picks the narrowest owner, so you stop arguing about libraries before you know what the state is. CX Codex +1 365installs sprint-retrospective Runs a sprint or milestone retrospective and turns it into a few owned actions instead of another template ritual. CX Codex +1 364installs debugging A skill that walks the agent through a reproduce → isolate → verify loop for concrete bugs, regressions and flaky failures. Useful once you already have a failing test or request. CX Codex +1 361installs git-submodule A skill that first asks whether a submodule is the right boundary, then walks you through one safe workflow. Useful when your project pulls in outside code through .gitmodules. CX Codex +1 360installs environment-setup A skill for app configuration: which values belong in .env, what gets committed, how to validate required variables, and where secrets stop being your problem. CX Codex +1 353installs system-environment-setup A skill that makes a repo runnable on any machine: pinned runtimes, local services, containers, bootstrap scripts and setup diagnosis. CX Codex +1 351installs npm-git-install Picks a safe delivery path for a Node package coming from a branch, commit, fork or private repo. Useful when the question is whether to pull from Git at all. CX Codex +1 350installs vercel-deploy This skill operates Vercel deployments for linked projects, from preview URLs and production releases to aliases, domains, environment sync, and rollback checks. CX Codex +1 347installs

Project sponsors

Companies that keep this analytics open
Gold sponsor

Impressions, clicks and code copies — open statistics. We keep the numbers public for the same reason NeBlask itself is public. Become a sponsor