Re: What's the best method between merging and rebasing ?

From: Pierre Habouzit <madcoder@debian.org>
Date: Mar 12, 2007, 12:08 UTC
Message-ID: <20070312120820.GE18952@mad.intersec.eu>
In-Reply-To: <200703121139.l2CBdcUL022906@localhost.localdomain>

On Mon, Mar 12, 2007 at 12:39:38PM +0100, Xavier Maillard wrote:

Show 15 quoted lines

> Hi,
> 
> Say I have a project in this state:
> 
> orig master -> A -> B -> C -> HEAD
> 
> I want to make A diverging from the original branch so I would be
> at this state :
> 
> orig master -> A -> B -> C -> HEAD
>      	    \
> 	     -> D -> E -> F -> 
> 
> I want master to be at  HEAD of the new branch and I want to pick
> commits here and there from the original master branch.

  I'm not sure I get this right, but if I understand you correctly, I'd
say that you could branch your master into a old-master branch.

  then delete the master branch, and branch it again from the "orig
master", then cherry pick from old-master what you want to keep.

  Of course those approachs only "work" if nobody clones your
repository, as you will rewrite history with that.

  But Maybe I missed what you want to achieve :)

-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org