Agent skill
git-hex-pr-workflow
Complete pull request workflow combining git-hex (local craft) with remote collaboration (GitHub plugin or CLI). This skill should be used when the user wants to prepare, submit, and iterate on a PR with clean commit history. Trigger phrases include: "prepare a PR", "open a pull request", "address review feedback", "update my PR", "clean up commits for PR".
Install this agent skill to your Project
npx add-skill https://github.com/yaniv-golan/git-hex/tree/main/skills/git-hex-pr-workflow
SKILL.md
Git-hex PR Workflow
When to use this Skill
This skill should be used when:
- The user wants to prepare a branch for PR submission with clean history
- The user is iterating on a PR after receiving review feedback
- The user asks about combining git-hex with GitHub/PR workflows
Trigger phrases include: "prepare a PR", "open a PR", "create a pull request", "address PR feedback", "update the PR", "force-push after rebase".
Workflow
-
Local craft (git-hex) - shape commits before pushing:
- Use
git-hex-getRebasePlanto inspect current history - Use
git-hex-createFixup+git-hex-rebaseWithPlanto clean up - Use
git-hex-splitCommitif commits need to be broken apart
- Use
-
Push to remote:
git push --force-with-lease(safe force push)
-
Remote collaboration - work with teammates:
- If the GitHub Plugin is installed: use its tools to create/update PRs, add reviewers, respond to comments
- Otherwise: use GitHub CLI (
gh) commands:gh pr create- create a pull requestgh pr view- view PR detailsgh pr edit- update PR title/body/reviewersgh pr comment- add comments
-
After review feedback:
- Return to step 1 for more local craft
- Use
git-hex-undoLastif a cleanup went wrong
Tools to prefer
- Local craft: all git-hex tools (see branch-cleanup skill)
- Remote: GitHub plugin tools if installed, otherwise
ghCLI
Key insight
git-hex handles the local craft of shaping commits.
Remote collaboration (via the GitHub Plugin from the Official Claude Plugin Marketplace, or standard gh CLI) handles working with teammates.
Together, they cover the complete pull request lifecycle.
Recommended Agent Skills
Expand your agent's capabilities with these related and highly-rated skills.
git-hex-branch-cleanup
This skill should be used when the user wants to clean up a feature branch's history using git-hex (squash/fixup commits, reorder/drop/split commits, or rebase a branch onto main) without using an interactive terminal. Trigger phrases include: "clean up my branch", "polish history", "squash these commits", "fixup commits", "rebase onto main", "rewrite commits".
git-hex-conflict-resolution
This skill should be used when the user is stuck in a git-hex-driven rebase, merge, or cherry-pick due to conflicts and wants the agent to inspect, resolve, and then continue or abort safely. Trigger phrases include: "resolve conflicts", "rebase is stuck", "conflict markers", "continue the rebase", "abort the rebase".
familiar-help
Use familiar companion tools for creative buddy/companion interactions. Handles fortunes, code roasts, haiku, stats, mood, lore, focus timers, and personality changes. Triggers when user addresses their companion by any name — "buddy" (Anthropic's UI label), "familiar", "companion", or whatever name the user uses for their companion — or by companion-specific intent: "tell me a fortune", "roast my code", "write a haiku", "show stats", "start a focus timer", "pomodoro", "be like Marvin", "change personality", "who are you", "what can you do". Do NOT use for normal code review, debugging, general coding help, or questions directed at Claude itself rather than the companion.
obsidian-vault
Search, create, and manage notes in the Obsidian vault with wikilinks and index notes. Use when user wants to find, create, or organize notes in Obsidian.
handoff
Compact the current conversation into a handoff document for another agent to pick up.
edit-article
Edit and improve articles by restructuring sections, improving clarity, and tightening prose. Use when user wants to edit, revise, or improve an article draft.
Didn't find tool you were looking for?