메뉴
Use when the user wants to commit and push in one go (用户提到 "提交并推送"、"提交后推上去"、"commit 并 push"、"commit and push"、"/git-commit-and-push"). Covers what that single request does and does NOT authorize, and when to stop between the two halves.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
Use when pushing commits to the remote (用户提到 "push"、"推一下"、"推到远程"、"git push"、"强推"、"force push"). Always resolves the push target to the CURRENT branch instead of master/main, sets upstream on first push, brakes on protected branches, and uses --force-with-lease for force pushes.
Use when the user asks to summarize recent commits into a PR description or write a pull request title and body from git history (用户提到 "生成 PR"、"总结最近 commit"、"输出 PR"、"pr-generate"). Also when the PR may touch env vars or database/SQL that need highlighting. Supports two diff ranges - recent N commits, or the diff against a remote base branch (如 "跟 master 的 diff"、"对比 origin/develop"、"base=master").
Use when starting work on a new branch in a multi-worktree repo and need to create the git worktree (用户提到 "新开 worktree"、"建 worktree"、"开个 worktree 做 X"、"切个分支并行开发"、"new worktree"). Enforces fetch-first, branch off latest origin/master, and sibling-of-repo-root dir named after the branch.
Use when the user wants to save, update, persist, or "remember" a global / user / AI / AGENT instruction or memory so it applies across all coding clients (Claude, Codex, Cursor). Triggers include "更新用户记忆", "保存全局指令", "记住…到全局 AGENT 指令", "save to global agent memory", "remember this globally". Assumes agent-root-cli has been set up once (init + link).
Use when the user wants to publish, post, or update a blog article to their hexi-site blog (Hexi1997/hexi-site) — triggers include "发布博客", "更新博客", "post to my blog", "hexi-blog-update". Handles slug, frontmatter, file placement, and pushing to main via local git/gh.
当用户提出“生成面试题”、“生成面试问答”、“根据我的简历生成面试题”、“帮我准备面试”、“模拟面试”，或希望基于其简历和项目描述生成面试问题与答案时，应使用此 skill。
| name | git-commit-and-push |
| description | Use when the user wants to commit and push in one go (用户提到 "提交并推送"、"提交后推上去"、"commit 并 push"、"commit and push"、"/git-commit-and-push"). Covers what that single request does and does NOT authorize, and when to stop between the two halves. |
把「生成规范 commit」和「推到当前分支」串成一条链。
commit 交给
git-commitskill，push 交给git-pushskill；本 skill 只管两者之间的交接、刹车和授权边界。
那两个 skill 装了就直接调用，规则别在这里重写（会漂）。没装时用文末「兜底规则」。
git status --porcelain，有暂存内容看 git diff --staged，否则看 git diff。
工作区和暂存区都干净 → 停，报告「没有可提交的改动」；不要因为用户说了 push 就空跑一次 push。git-commit skill。默认把当前全部改动一次性提交为单个 commit，不主动分批（用户明确要求拆分时才拆）。--no-verify 绕过，不许 amend 掩盖，不许"先推上去再说"。git-push skill：动态解析当前分支、比对 @{upstream} 分支名、受保护分支刹车。已推送 <branch> → <upstream>，附 PR 链接。= 同意本次 commit + 把它推到当前分支。不包括下面任何一项：
| 不在授权范围 | 怎么办 |
|---|---|
推 master / main | 停，按 git-push 的受保护分支流程等明确确认 |
| upstream 分支名 ≠ 当前分支名时直推 | 不直推（会打到 master）；git push -u origin "$BRANCH" 推同名分支并改绑 |
强推（--force-with-lease） | 单独再确认一次，哪怕用户已经说了 push |
push 被拒后 git pull / rebase / 强推 | 只报告 + 给建议，等用户决定 |
跳过 hook（--no-verify） | 不做 |
| amend / reset / 改写已有提交 | 不做 |
| 建 PR、合并、部署 | 不做，最多把 PR 链接贴出来 |
一条线：这条链只新增一个 commit，并把它推到当前分支。任何会改写历史、或落到别人分支上的动作，都要再问一次。
| 卡在哪 | 动作 |
|---|---|
| 没有改动 | 报告并结束，不 commit 不 push |
| commit 失败（hook / 空提交 / 冲突未解） | 报告原因，不 push；修完重新走流程（新 commit，不 amend） |
| push 被拒（non-fast-forward） | commit 保留在本地，报告远端有新提交，给出 git pull --rebase 或强推两个选项让用户选 |
| 在 master/main 上 | commit 可以先做完（本地安全），push 停下等确认；同时建议 git switch -c <new-branch> |
| detached HEAD | 直接停，告诉用户当前不在任何分支上 |
push 失败不要回滚刚才的 commit —— 本地提交是有效成果，撤销它只会丢工作。
| 项 | 规则 |
|---|---|
| 提交粒度 | 默认全部改动一个 commit，不主动分批 |
| commit message | Conventional Commits，英文，subject < 72 字符，祈使句现在时 |
| 敏感文件 | .env / 密钥 / 凭据一律不提交 |
| commit 失败 | 不 push，不 --no-verify |
| push 目标 | 动态解析的当前分支；命令里不许出现字面量 master / main |
| master/main | commit 可做，push 停下等确认 |
| push 被拒 | 报告 + 给选项，不自动 pull/rebase/强推 |
| 成功输出 | <commit 标题> <short-hash> + 已推送 <branch> → <upstream> + PR 链接 |
git pull —— 可能拖进意外的 merge commit 或别人的改动。先问。git reset 撤掉刚提交的 commit —— 提交是好的，问题在远端；撤销纯属自伤。git-commit skill 未安装时）只在调不到 git-commit skill 时用这份最小规则完成第 2 步：
<type>[optional scope]: <description>
[optional body]
feat / fix / docs / style / refactor / perf / test / build / ci / chore / reverttype!: 或加 BREAKING CHANGE: footergit commit -m "$(cat <<'EOF'
<type>[scope]: <description>
<body>
EOF
)"
push 那半永远走 git-push skill；它不在时，最低限度也要：解析 BRANCH=$(git rev-parse --abbrev-ref HEAD)、比对 @{upstream} 分支名、名字不符或首次推就 git push -u origin "$BRANCH"。