Agent Plugins Marketplace
← All plugins

git

v1.30.0

Git workflow automation with smart commits, conflict resolution, rebase management, worktree creation, and worktree cleanup

CodexClaude Code11 Skills

By Craig MotlinLicense: Apache-2.015 GitHub starsUpdated 15 hours ago

Directory evidence

Runtimes
Codex and Claude Code
Parsed components
11 skill or MCP entries
Source updated
Aug 26, 2026
Manifest status
Canonical path parsed

The directory validates manifest shape and source location. It does not execute the plugin or provide a security endorsement. Review the indexing methodology →

Install plugin

Installs for the current user
codex plugin marketplace add IchenDEV/agent-plugin-mkt
codex plugin marketplace upgrade agent-plugin-marketplace
codex plugin add git@agent-plugin-marketplace

Paste and run these commands in a terminal with Codex. They add and refresh the PluginsMP catalog, then install this plugin.

The installer fetches third-party code from the source repository shown on this page. This directory validates manifest structure and source location, but does not perform a security audit; review the manifest, components, and source before installing.

Get the source manually
git clone https://github.com/motlin/claude-code-plugins

Clone the source repository, then follow its setup instructions to add the plugin to a compatible client. The plugin root is plugins/git/.

Plugin files

plugins/git/
├── .codex-plugin/plugin.json
├── .claude-plugin/plugin.json
├── skills/git-clean-worktrees/SKILL.md
├── skills/git-commit/SKILL.md
├── skills/git-commit-chunks/SKILL.md
├── skills/git-conflicts/SKILL.md
├── skills/git-rebase/SKILL.md
├── skills/git-rebase-all/SKILL.md
├── skills/git-reword-commits/SKILL.md
├── skills/git-split-branch/SKILL.md
├── skills/git-workflow/SKILL.md
├── skills/git-worktree/SKILL.md
└── skills/wip/SKILL.md

Included Skills11

git-clean-worktreesskills/git-clean-worktrees/SKILL.md

Remove git worktrees safely without force.

git-commitskills/git-commit/SKILL.md

Commit local changes with careful staging and single-line messages. Use for all git commit operations.

git-commit-chunksskills/git-commit-chunks/SKILL.md

Split local changes into multiple logical commits. Use when the user asks to commit changes in chunks.

git-conflictsskills/git-conflicts/SKILL.md

Resolve git merge or rebase conflicts and continue the operation.

git-rebaseskills/git-rebase/SKILL.md

Rebase local commits on the configured upstream using the plugin rebase script.

git-rebase-allskills/git-rebase-all/SKILL.md

Rebase all local branches onto the configured upstream branch.

git-reword-commitsskills/git-reword-commits/SKILL.md

Rewrite in-scope commit messages to single-line git-workflow messages with git history reword.

git-split-branchskills/git-split-branch/SKILL.md

Split the current branch into multiple branches with one commit each.

git-workflowskills/git-workflow/SKILL.md

Commit message format and git workflow rules. ALWAYS use this skill for every git commit — no exceptions — and whenever rewording an existing commit message.

git-worktreeskills/git-worktree/SKILL.md

Create a git worktree in a peer directory using the plugin worktree script.

wipskills/wip/SKILL.md

Run on /wip or for a whole-repository cleanup spanning multiple worktrees and branches. Trigger when the request combines operations such as removing stale worktrees, rebasing all branches, retesting, and pushing, including "clean up my worktrees and branches", "rebase all my branches and get them tested and pushed", or "settle my WIP". The workflow gates destructive and outward-facing actions, never uses --force, and handles worktree, rebase, and test edge cases. Defer to single-operation git skills when the user targets one specific branch or worktree. Wraps git:clean-worktrees and build:test-all.

Plugin manifests2

plugins/git/.codex-plugin/plugin.json
{
  "name": "git",
  "version": "1.30.0",
  "description": "Git workflow automation with smart commits, conflict resolution, rebase management, worktree creation, and worktree cleanup",
  "author": {
    "name": "Craig Motlin"
  },
  "license": "Apache-2.0",
  "homepage": "https://github.com/motlin/claude-code-plugins/tree/main/plugins/git",
  "repository": "https://github.com/motlin/claude-code-plugins",
  "keywords": [
    "codex",
    "plugin",
    "git"
  ],
  "interface": {
    "displayName": "Git",
    "shortDescription": "Git workflow automation with smart commits, conflict resolution, rebase management, worktree creation, and worktree cleanup",
    "longDescription": "Git workflow automation with smart commits, conflict resolution, rebase management, worktree creation, and worktree cleanup",
    "developerName": "Craig Motlin",
    "category": "Productivity",
    "capabilities": [
      "Skills"
    ],
    "defaultPrompt": [
      "Use the git plugin."
    ],
    "brandColor": "#3B82F6"
  },
  "skills": "./skills/"
}
plugins/git/.claude-plugin/plugin.json
{
  "$schema": "https://anthropic.com/claude-code/plugin.schema.json",
  "name": "git",
  "description": "Git workflow automation with smart commits, conflict resolution, rebase management, worktree creation, and worktree cleanup",
  "version": "1.30.0",
  "license": "Apache-2.0",
  "author": {
    "name": "Craig Motlin"
  },
  "agents": [
    "./agents/commit-handler.md",
    "./agents/rebaser.md",
    "./agents/conflict-resolver.md"
  ],
  "skills": [
    "./skills/git-workflow"
  ],
  "commands": [
    "./commands/worktree.md",
    "./commands/commit.md",
    "./commands/commit-chunks.md",
    "./commands/conflicts.md",
    "./commands/rebase-all.md",
    "./commands/clean-worktrees.md",
    "./commands/split-branch.md",
    "./commands/reword-commits.md"
  ]
}

For maintainers

If you maintain this plugin, link to this source-backed listing from your README so users can review its manifest and indexed components.

[git on Agent Plugins Marketplace](https://pluginsmp.com/plugins/git)