Skip to content

Commit a8ab60d

Browse files
committed
feat(git): add git issue resolve slash command
1 parent 066223c commit a8ab60d

File tree

4 files changed

+430
-0
lines changed

4 files changed

+430
-0
lines changed

PLUGINS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Git workflow automation and utilities
5454

5555
**Commands:**
5656
- **`/git:branch-cleanup` `[--dry-run] [--merged-only] [--remote]`** - Clean up old and defunct branches that are no longer needed
57+
- **`/git:branch-resolve` `[issue-description]`** - Analyze and resolve git branch issues (conflicts, divergence, push/pull problems)
5758
- **`/git:cherry-pick-by-patch` `<commit_hash>`** - Cherry-pick git commit into current branch by "patch" command
5859
- **`/git:commit-suggest` `[N]`** - Generate Conventional Commits style commit messages or summarize existing commits
5960
- **`/git:debt-scan`** - Analyze technical debt indicators in the repository

docs/data.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
"synopsis": "/git:branch-cleanup [--dry-run] [--merged-only] [--remote]",
1414
"argument_hint": "[--dry-run] [--merged-only] [--remote]"
1515
},
16+
{
17+
"name": "branch-resolve",
18+
"description": "Analyze and resolve git branch issues (conflicts, divergence, push/pull problems)",
19+
"synopsis": "/git:branch-resolve [issue-description]",
20+
"argument_hint": "[issue-description]"
21+
},
1622
{
1723
"name": "cherry-pick-by-patch",
1824
"description": "Cherry-pick git commit into current branch by \"patch\" command",

plugins/git/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ Git workflow automation and utilities for Claude Code.
44

55
## Commands
66

7+
### `/git:branch-resolve`
8+
9+
Analyze and resolve git branch issues (conflicts, divergence, push/pull problems)
10+
711
### `/git:cherry-pick-by-patch`
812

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

0 commit comments

Comments
 (0)