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-pluginsRun it inside Claude Code after adding the marketplace with /plugin marketplace add motlin/claude-code-plugins.
Contents
Discovered from sourceSkills 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 switchinstead ofgit checkoutfor switching branchesgit switch -cinstead ofgit checkout -bfor creating branchesgit restoreinstead ofgit checkout --for restoring filesgit restore --stagedinstead ofgit reset HEADfor unstaging filesgit replay --ontoinstead ofgit rebase --ontofor non-interactive onto rebasesgit history rewordinstead of interactive rebase or amending for editing commit messagesgit history splitinstead 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- git-guardsv1.42.0
- githubv1.42.0
- herdr-rebootv1.42.0
- herdr-titlesv1.42.0
- investigation-reportv1.42.0
- iterm2-titlesv1.14.0
- javav1.42.0
- justfilev1.42.0
- markdown-tasksv1.42.0
- narrationv1.42.0
- offline-claude-code-guidev1.14.0
- orchestrationv1.42.0
- plans-dashboardv1.42.0
- plugin-and-skill-devv1.42.0
- pushoverv1.14.0
- recapv1.42.0
- stop-phrase-guardv1.42.0
- temporal-datav1.42.0
- tmux-titlesv1.42.0
- upstream-syncv1.42.0
- worktree-setupv1.42.0
- bash-guardsv1.42.0
- buildv1.42.0
- builtin-tasksv1.14.0
