交互式 rebase 如何工作？

Question

交互式 rebase 如何工作？

Accepted Answer

**交互式 rebase** (`git rebase -i`) 允许你**重写、重新排序、合并、编辑或删除提交** — 在分享之前清理你的提交历史。它是从混乱的进行中工作提交制作干净、逻辑清晰历史的强大工具。 ## 启动交互式 rebase ```bash git rebase -i HEAD~4 # interactively rebase the last 4 commits git rebase -i # rebase commits after # → opens an editor listing the commits with actions to apply ``` ## 操作 ```text pick abc123 Add login form # keep the commit as-is squash def456 Fix typo # COMBINE into the previous commit (merge messages) fixup ghi789 Fix another typo # combine into previous, DISCARD this message reword jkl012 Add validation # keep the commit but EDIT its message edit mno345 Refactor auth # PAUSE to amend the commit (change content) drop pqr678 Debug logging # DELETE this commit entirely # reorder lines to REORDER commits ``` 你编辑列表 — 为每个提交选择一个操作（重新排序行会重新排序提交） — 然后 Git 会相应地重新执行它们。 ## 常见用途 ```text ✓ SQUASH multiple WIP commits into one clean commit ("wip", "fix", "oops" → one good commit) ✓ REWORD bad commit messages ✓ REORDER commits into a logical sequence ✓ DROP unwanted commits (debug code, mistakes) ✓ SPLIT a commit (via edit) into smaller commits → Result: a clean, logical history instead of messy development commits. ``` ## 黄金法则仍然适用 ```text ⚠️ Interactive rebase REWRITES history (new commit hashes): → only do it on LOCAL, UNPUSHED commits — never on shared/public history → typical use: clean up your feature branch BEFORE pushing/opening a PR ``` ## 为什么这很重要理解交互式 rebase 对于**制作干净的提交历史**很有价值，因此它是专业 Git 工作的实用知识。在开发过程中，提交通常很混乱 — 带有诸如