From 6297f5b61d7385a712f63ce8f4b985946ff46d6a Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sun, 8 Feb 2026 19:26:02 +0000 Subject: [PATCH] feat(claude/commands): improve commit-push-pr with PR template and master branch support Add PR template auto-detection context, handle master as a default branch alongside main, and use template content for PR body when available. Co-Authored-By: Claude Opus 4.6 --- claude/commands/commit-push-pr.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/claude/commands/commit-push-pr.md b/claude/commands/commit-push-pr.md index 2c232fa..12bed4f 100644 --- a/claude/commands/commit-push-pr.md +++ b/claude/commands/commit-push-pr.md @@ -9,22 +9,26 @@ source: https://github.com/anthropics/claude-plugins-official/blob/main/plugins/ - Current git status: !`git status` - Current git diff (staged and unstaged changes): !`git diff HEAD` - Current branch: !`git branch --show-current` +- PR template (if exists): !`cat .github/PULL_REQUEST_TEMPLATE.md 2>/dev/null || echo "No PR template found"` -## Your task +## Your Task Based on the above changes: -1. Create a new branch if on main. If already on a non-main branch, check if the - branch name looks randomly generated (e.g. UUIDs, hex strings, meaningless - character sequences, or 1-3 random unrelated words like "brave-fox" or - "purple-mountain") rather than descriptive of the changes. If so, rename it - to something that aligns with the changes using `git branch -m `. +1. Create a new branch if on main or master. If already on a non-main/master + branch, check if the branch name looks randomly generated (e.g. UUIDs, hex + strings, meaningless character sequences, or 1-3 random unrelated words like + "brave-fox" or "purple-mountain") rather than descriptive of the changes. If + so, rename it to something that aligns with the changes using: + `git branch -m `. 2. Create a single commit with an appropriate message. If asked to commit only staged changes, run `git diff --staged` to see exactly what is staged, and base the commit message solely on those changes. Do NOT stage additional files. Otherwise, stage all relevant changes. 3. Push the branch to origin -4. Create a pull request using `gh pr create` +4. Create a pull request using `gh pr create`. If a PR template exists in the + context above, use it as the base for the PR body and fill in the sections + appropriately based on the changes. 5. You have the capability to call multiple tools in a single response. You MUST do all of the above in a single message. Do not use any other tools or do anything else. Do not send any other text or messages besides these tool