Rebase the current branch onto a target branch using safety checks and an appropriate rebase strategy. Use when invoked as `$git-rebase` or when the user asks to update/rebase a branch.
中文简介正在准备中。当前显示原文说明。
查看安装方法安装前可以查看交给 AI 代理的指令内容。
Rebase the current branch onto a target branch. If the user provides an argument, use it as the target branch; otherwise use the remote default branch.
Gather context:
subject=$(git branch --show-current)
target=<argument-or-default-branch>
git status --porcelain=v1
Stop if:
subject equals target.Fetch remote-tracking refs without touching the local target branch:
git fetch origin --prune
target_ref="origin/${target}"
Never use git fetch origin "${target}:${target}" for a branch that may be checked out in another worktree. If a local target branch must be updated, do that only in the worktree that currently has it checked out.
Analyze divergence:
merge_base=$(git merge-base HEAD "${target_ref}")
git log --oneline "${merge_base}..HEAD"
git log --oneline "${merge_base}..${target_ref}"
git diff --name-only "${merge_base}" HEAD
git diff --name-only "${merge_base}" "${target_ref}"
git merge-base --is-ancestor "${merge_base}" "${target_ref}" && echo base_on_target=yes || echo base_on_target=no
Choose strategy:
| Condition | Strategy |
|---|---|
| Target has at least 20 commits and at least 3 overlapping files | cherry-pick |
| Merge-base is not on target lineage | rebase --onto |
| Otherwise | simple rebase |
Show the analysis and selected strategy before proceeding.
Execute:
git rebase "${target_ref}"git rebase --onto "${target_ref}" "${merge_base}" HEAD<subject>__cherrypick__ from target_ref and cherry-pick subject commits oldest-first.On conflicts, resolve automatically and continue; rerere makes this recoverable:
rerere resolution..codex/*.config.toml trust hashes): keep ours (git checkout --ours); the clean filter re-normalizes the blob on git add.--skip the commit if the bump is already upstream.git checkout --theirs).Stage each fix, verify no conflict markers remain, then --continue (or --skip if the commit became empty). Pause and ask only for genuine semantic collisions in hand-written source — never guess those. Report how each conflict was resolved.
After success, set tracking and push:
git branch --set-upstream-to="origin/${subject}" "${subject}"
git push --force-with-lease -u origin "${subject}:${subject}"
git branch -vv
Report strategy, branch, and tracking.
还没有评价。欢迎分享你的使用感受。
无需登录即可发表。欢迎分享使用感受、提问，或说明在哪些环境下无法运行。
还没有评论。来写第一条吧。
Quick-save the last assistant response as a verbatim note in the 2ndBrain Obsidian vault (~/2ndBrain/quick-notes/<year>/). Use when the user asks to quick-save/save the last response to 2ndBrain, or invokes $2ndbrain or /skill:2ndbrain.
中文简介正在准备中。当前显示原文说明。
Write commit messages under the agent-commits convention - a Conventional Commits fork with no chore catch-all, intent-only type tokens, facts in trailers, and legally-grounded AI provenance (Assisted-by, never Co-authored-by). Use when composing a commit in a repo whose commitlint.config.js extends agent-commits, when deciding between feat/fix/refactor/perf, or when recording AI participation.
中文简介正在准备中。当前显示原文说明。
Coordinate multi-agent work through durable artifacts in git instead of chat. Use this whenever a task involves sending a message to another agent, agent mailboxes or handoffs, claiming work from a shared queue, notifying another agent or crew (OpenClaw, Grok Bot, Claude Code, Codex, Gas Town/Gas City workers) that work is ready, or whenever the user mentions the artifact bus, message bus, agent mail, beads mail, doorbells, or pings between agents — even if they don't say "bus" explicitly.
中文简介正在准备中。当前显示原文说明。
Use aven to find tasks, update status, and leave durable handoff context.
中文简介正在准备中。当前显示原文说明。
Plan, order and deliver a batch of backlog items (e.g. every High item) in a Conventional Docs repo, one decision, branch, worktree, draft PR, review and merge per item. Use when asked to work through the backlog, implement all items of a priority, or sequence several backlog items end to end.
中文简介正在准备中。当前显示原文说明。
Codex workflow tips from Boris Cherny (creator of Codex) and the Codex team. Use when: setting up Codex, optimizing workflows, running parallel sessions, configuring AGENTS.md, using skills/commands, subagents, hooks, MCP integrations, or learning best practices. Covers: git worktrees, plan mode, verification, permissions, Slack MCP, BigQuery, prompting tips, plugins, custom agents, sandboxing, keybindings, status lines, output styles, customization, /simplify for code quality, /batch for parallel code migrations, /loop for scheduled tasks, code review agents, /btw for mid-task questions, /effort max reasoning, remote control sessions, voice mode, setup scripts, session naming, /color, PostCompact hook, auto mode, /schedule cloud jobs, iMessage plugin, auto-memory, and auto-dream, mobile app, session teleporting, Cowork Dispatch, Chrome extension, Desktop app, /branch forking, --bare SDK startup, --add-dir multi-repo, --agent custom agents, /voice input.
中文简介正在准备中。当前显示原文说明。