情况是这样，我有三个分支，master、fix#1 和 fix#2，后两个分支都在修复一个特定的错误。
问题是，我基于 fix#1 的 fix#2，而不是从 master 分支，所以它看起来像这样
fix#2
|
fix#1
|
master
而不是
fix#1 fix#2
| /
master
有什么简单的方法可以从fix#2 分支中删除所有fix#1 提交（实际上是一个提交）？
【问题讨论】：
标签： git branch git-branch
git rebase --onto master fix1 fix2
但请确保您在执行此操作之前了解会发生什么以及所有后果。
git rebase -h 输出：
Usage: git rebase [--interactive | -i] [-v] [--force-rebase | -f] [--no-ff] [--onto <newbase>] (<upstream>|--root) [<branch>] [--quiet | -q]
git-rebase replaces <branch> with a new branch of the
same name. When the --onto option is provided the new branch starts
out with a HEAD equal to <newbase>, otherwise it is equal to <upstream>
It then attempts to create a new commit for each commit from the original
<branch> that does not exist in the <upstream> branch.
It is possible that a merge failure will prevent this process from being
completely automatic. You will have to resolve any such merge failure
and run git rebase --continue. Another option is to bypass the commit
that caused the merge failure with git rebase --skip. To restore the
original <branch> and remove the .git/rebase-apply working files, use the
command git rebase --abort instead.
Note that if <branch> is not specified on the command line, the
currently checked out branch is used.
Example: git-rebase master~1 topic
A---B---C topic A'--B'--C' topic
/ --> /
D---E---F---G master D---E---F---G master
【讨论】：