Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions PLUGINS.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Git workflow automation and utilities

**Commands:**
- **`/git:branch-cleanup` `[--dry-run] [--merged-only] [--remote]`** - Clean up old and defunct branches that are no longer needed
- **`/git:branch-resolve` `[issue-description]`** - Analyze and resolve git branch issues (conflicts, divergence, push/pull problems)
- **`/git:cherry-pick-by-patch` `<commit_hash>`** - Cherry-pick git commit into current branch by "patch" command
- **`/git:commit-suggest` `[N]`** - Generate Conventional Commits style commit messages or summarize existing commits
- **`/git:debt-scan`** - Analyze technical debt indicators in the repository
Expand Down
6 changes: 6 additions & 0 deletions docs/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
"synopsis": "/git:branch-cleanup [--dry-run] [--merged-only] [--remote]",
"argument_hint": "[--dry-run] [--merged-only] [--remote]"
},
{
"name": "branch-resolve",
"description": "Analyze and resolve git branch issues (conflicts, divergence, push/pull problems)",
"synopsis": "/git:branch-resolve [issue-description]",
"argument_hint": "[issue-description]"
},
{
"name": "cherry-pick-by-patch",
"description": "Cherry-pick git commit into current branch by \"patch\" command",
Expand Down
4 changes: 4 additions & 0 deletions plugins/git/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Git workflow automation and utilities for Claude Code.

## Commands

### `/git:branch-resolve`

Analyze and resolve git branch issues (conflicts, divergence, push/pull problems)

### `/git:cherry-pick-by-patch`

Cherry-pick a git commit into the current branch using the patch command instead of git cherry-pick.
Expand Down
Loading