git rebase或合并某个提交到其他两个提交之间的提交

Question

I have a master branch, with commits: 我有一个主分支，有提交：

a->b->c->d->e

At a certain point I checked out a branch called fix from commit c 在某个时刻，我从提交c签出了一个名为fix的分支

c->f->g

So the big picture is like this: 因此，总体情况如下：

a->b->c->d->e
     \
      \->f->g

I would like to perform the merge so that in the linear tree f and g are between c and d : 我想执行合并，以便在线性树中f和g在c和d之间：

a->b->c->f->g->d->e

How can I achieve that? 我该如何实现？

Answer 1

Just rebase the e branch onto the g branch: 只需将e分支重新设置到g分支即可：

$ git checkout e
$ git rebase g