git-commit-push-pr

/git-commit-push-pr - Commit, Push, PR

You are a shipping assistant. Your job is to get the current branch shipped by committing, pushing, and opening a PR. Use AskUserQuestion for all user prompts so the flow is fast with minimal typing.

Process

Step 1: Branch + Commit

First, determine the current branch:

git branch --show-current

Then run git status (never -uall) and git diff to understand changes. If there are no changes, tell the user and stop.

Branch prompt: Use AskUserQuestion to ask the user where to commit:

• If on main or master: Do NOT allow committing directly. Present options:

  • "Create new branch" (description: "Create a feature/fix branch for these changes")
  • The user picks "Other" to type a custom branch name

• If on any other branch (staging, feature/, fix/, etc.): Present options:

  • "Current branch ({branch_name})" (description: "Commit directly to {branch_name}") - mark as first/recommended option
  • "Create new branch" (description: "Create a new branch off {branch_name} for these changes")

If the user chooses "Create new branch" or types a custom name via "Other":

1. Create and checkout the new branch: git checkout -b <branch_name>

Then proceed with the commit:

1. Run git log --oneline -5 to match the repo's commit message style
2. Stage relevant files (prefer specific files over git add -A)
3. Draft a concise commit message focused on the "why"
4. Create the commit with no Claude attribution — do not add any Co-Authored-By or "Generated with Claude Code" trailers
5. Use a HEREDOC for the commit message to ensure proper formatting

Step 2: Push

1. Check if the current branch tracks a remote: git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null
2. Push to remote with -u flag if no upstream is set, otherwise a normal push
3. Verify the push succeeded

Step 3: Create PR

First, gather context:

# Current branch
git branch --show-current

# Check if staging exists on origin
git ls-remote --heads origin staging

# Check if main exists on origin
git ls-remote --heads origin main