メニュー
Submit PRs to upstream repos from a fork — commit selection, squashing, cross-fork creation. Use when contributing changes upstream or cherry-picking fork commits.
デフォルトでは、最初にソースを確認する Prompt が選択されています。直接コマンドに切り替えるか、ローカルコピーをダウンロードすることもできます。
インストールを決める前に、SKILL.md と SkillsMP に表示されている付属ファイルをお読みください。
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
直接コマンドでは確認用 Prompt が省略されます。実行前にソースを確認してください。
npx skills add https://github.com/laurigates/claude-plugins --skill git-upstream-prコマンドは1行のまま表示されます。コピー前に横へスクロールして全体を確認してください。
ローカルで確認しますか？SkillsMP が現在取得できるファイルをダウンロードできます。
Install, configure and troubleshoot MCP servers. Use when adding/enabling servers, editing .mcp.json, fixing OAuth, or when a server runs stale code after an upstream fix.
FinOps snapshot — org billing, workflow stats, cache usage. Use when you want a high-level view of CI spending or workflow health before diving deeper.
GitHub Actions billing, workflow efficiency, and waste analysis at org or repo level. Use when investigating CI/CD costs, wasted runs, or optimizing triggers.
SKILL.md を表示中
SOC 職業分類に基づく
| name | git-upstream-pr |
| description | Submit PRs to upstream repos from a fork — commit selection, squashing, cross-fork creation. Use when contributing changes upstream or cherry-picking fork commits. |
| args | [--commits sha1,sha2] [--branch name] [--upstream owner/repo] [--draft] [--dry-run] |
| allowed-tools | Bash(git status *), Bash(git diff *), Bash(git log *), Bash(git remote *), Bash(git fetch *), Bash(git switch *), Bash(git cherry-pick *), Bash(git reset *), Bash(git commit *), Bash(git push *), Bash(git stash *), Bash(git rev-list *), Bash(git rev-parse *), Bash(git branch *), Bash(gh pr *), Bash(gh repo *), Bash(gh auth *), AskUserQuestion, Read, Grep, Glob, TodoWrite |
| argument-hint | --commits abc123,def456 or --branch feat/my-upstream-pr |
| disable-model-invocation | true |
| created | "2026-03-02T00:00:00.000Z" |
| modified | "2026-06-18T00:00:00.000Z" |
| reviewed | "2026-03-02T00:00:00.000Z" |
Submit clean, atomic PRs to upstream repositories from fork work.
| Use this skill when... | Use something else instead when... |
|---|---|
| Contributing changes back to the upstream repo | Committing to your own fork/repo → /git:commit |
| Cherry-picking fork commits for upstream PR (single or multi-commit, squashing) | Creating a PR within the same repo → /git:pr |
| Fork and upstream are roughly aligned | Fork has substantially diverged from upstream → /git:upstream-pr-diverged (patch-id eligibility, re-derive fallback, scrubbing) |
| Need a clean branch based on upstream/main | Working on a branch already tracking upstream |
git branch --show-currentgit status --porcelain=v2 --branchgit remote -vgit remote -vgit remote -vgit remote -vgit log --oneline --max-count=20git stash listParse these from $ARGUMENTS:
| Parameter | Required | Description |
|---|---|---|
--commits sha1,sha2,... | No | Comma-separated commit SHAs to cherry-pick (interactive selection if omitted) |
--branch name | No | Name for the upstream PR branch (auto-generated if omitted) |
--upstream owner/repo | No | Override upstream repo (detected from remote if omitted) |
--draft | No | Create PR as draft |
--dry-run | No | Show what would happen without making changes |
Execute this fork-to-upstream PR workflow:
git rev-parse --git-dirupstream remote exists (from context)upstream remote:
gh repo view --json parent -q '.parent.nameWithOwner'git remote add upstream https://github.com/<owner/repo>.gitgit fetch upstreamgit stash push -m "upstream-pr: WIP before upstream PR"Report the fork's divergence from upstream:
Fork status:
Upstream: <upstream-repo>
Behind upstream/main: N commits
Ahead of upstream/main: M commits
If --dry-run is set, also show which commits would be selected and stop here.
If --commits provided:
git rev-parse --verify <sha>If --commits not provided:
git log --oneline --format='%h %s (%cr)' upstream/main..HEAD
--branch not provided:
feat(auth): add OAuth -> feat/auth-add-oauth)upstream-pr/<date>git switch -c <branch-name> upstream/main
git cherry-pick <sha1> <sha2> ...
git cherry-pick --continuegit reset --soft upstream/main
git commit -m "<conventional commit message>"
git push -u origin <branch-name>
If --dry-run, show the command without executing.
--upstream or detected remote)origin remote URL)gh pr create \
--repo <upstream-owner/upstream-repo> \
--base main \
--head <fork-owner>:<branch-name> \
--title "<conventional commit title>" \
--body "<PR description>"
--draft if the flag was provided.git switch <original-branch>
git stash pop
Upstream PR created:
PR: <url>
Branch: <branch-name>
Commits: N cherry-picked, squashed into 1
Original branch restored: <branch>
| Error | Recovery |
|---|---|
| Cherry-pick conflict | Show conflicted files, reference git-conflicts skill |
| Push rejected | Check if branch already exists on fork; suggest --branch override |
| No upstream remote | Auto-detect from gh repo view --json parent or ask user |
| Upstream/main not found | Try upstream/master; ask user for correct branch name |
| No commits ahead of upstream | Report "Nothing to contribute" and exit |
| Context | Command |
|---|---|
| Divergence check | git rev-list --left-right --count upstream/main...HEAD |
| Commits ahead | git log --oneline --format='%h %s' upstream/main..HEAD |
| Validate SHA | git rev-parse --verify --short <sha> |
| Fork owner | git remote get-url origin | sed -E 's#.*github.com[:/]##; s#\.git$##; s#/.*##' |
| Upstream repo | git remote get-url upstream | sed -E 's#.*github.com[:/]##; s#\.git$##' |
| Cross-fork PR | gh pr create --repo <upstream> --head <fork-owner>:<branch> |