Skip to content

brycewang-stanford/Auto-Empirical-Research-Skills / skills/12-pedrohcgs-claude-code-my-workflow/dot-claude/skills/commit

commit

Verified

Stage, commit, create PR, and merge to main. Use for the standard commit-PR-merge cycle.

Commit, PR, and Merge

Stage changes, commit with a descriptive message, create a PR, and merge to main.

Steps

  1. Check current state:
git status
git diff --stat
git log --oneline -5
  1. Create a branch from the current state:
git checkout -b <short-descriptive-branch-name>
  1. Stage files — add specific files (never use git add -A):
git add <file1> <file2> ...

Do NOT stage .claude/settings.local.json or any files containing secrets.

  1. Commit with a descriptive message:

If $ARGUMENTS is provided, use it as the commit message. Otherwise, analyze the staged changes and write a message that explains why, not just what.

git commit -m "$(cat <<'EOF'
<commit message here>
EOF
)"
  1. Push and create PR:
git push -u origin <branch-name>
gh pr create --title "<short title>" --body "$(cat <<'EOF'
## Summary
<1-3 bullet points>

## Test plan
<checklist>

🤖 Generated with [Claude Code](https://claude.com/claude-code)
EOF
)"
  1. Merge and clean up:
gh pr merge <pr-number> --merge --delete-branch
git checkout main
git pull
  1. Report the PR URL and what was merged.

Important

  • Always create a NEW branch — never commit directly to main
  • Exclude settings.local.json and sensitive files from staging
  • Use --merge (not --squash or --rebase) unless asked otherwise
  • If the commit message from $ARGUMENTS is provided, use it exactly
receiving-code-reviewobra/superpowersUse when receiving code review feedback, before implementing suggestions, especially if feedback seems unclear or technically questionable - requires technical rigor and verification, not performative agreement or blind implementationStars: 321kUpdated Claude CodeCodexVerifiedInstall
requesting-code-reviewobra/superpowersUse when completing tasks, implementing major features, or before merging to verify work meets requirementsStars: 321kUpdated Claude CodeCodexVerifiedInstall
using-git-worktreesobra/superpowersUse when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallbackStars: 321kUpdated Claude CodeCodexVerifiedInstall
verification-before-completionobra/superpowersUse when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming output before making any success claims; evidence before assertions alwaysStars: 321kUpdated Claude CodeCodexVerifiedInstall