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

version
1.42.0
GitHub stars
20

Install

/plugin install git@motlin-claude-code-plugins

Run it inside Claude Code after adding the marketplace with /plugin marketplace add motlin/claude-code-plugins.

Contents

Discovered from source

Skills 1

Git Workflow

Commit with the git:commit skill.

Commit Message Format

Every commit message is a single line: no body, no bullet list, no extra paragraphs. It:

  • Starts with a present-tense verb (Add, Fix, Replace, Remove, Update, …)
  • Is 60-120 characters
  • Ends with a period
  • Avoids praise adjectives (comprehensive, robust, essential, best practices)

A task description or prompt is intent, not the message. Distill a long or multi-line prompt to one line; never copy it verbatim. This applies to new commits and to rewording existing ones with git history reword.

Conflicts and Rebasing

Resolve conflicts with the git:conflicts skill.

Rebase the current branch on upstream with the git:git-rebase skill.

Prefer Modern Git Commands

  • git switch instead of git checkout for switching branches
  • git switch -c instead of git checkout -b for creating branches
  • git restore instead of git checkout -- for restoring files
  • git restore --staged instead of git reset HEAD for unstaging files
  • git replay --onto instead of git rebase --onto for non-interactive onto rebases
  • git history reword instead of interactive rebase or amending for editing commit messages
  • git history split instead of interactive rebase for splitting commits

Hooks 1

Sponsors

Details

Marketplace
motlin/claude-code-plugins
Source
plugins/git
Author
Craig Motlin
Category
Productivity

More from motlin/claude-code-plugins

All 30