Question

这里的情况是,我有三个分支:<代码>master/code>,fix#1和#2,其中后两个分支各设一个具体标。

The problem is, I based fix#2 on fix#1, instead on branching from master, so it looks something like this

fix#2
|
fix#1
|
master

而不是

fix#1  fix#2
|     / 
master

www.un.org/Depts/DGACM/index_spanish.htm 是否有任何简单的方法可以删除所有<代码>第1号。由<代码>#2承诺页: 1

Answer 1

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

友情链接