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

   From: Pierre Habouzit [off-list ref]

   On Mon, Mar 12, 2007 at 12:39:38PM +0100, Xavier Maillard wrote:
   > 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.

What I am tryin to explain is that I want to get rid of the old
master branch and pick commits from it here and there (that's
what is called cherry-pick I guess).

So in the end I will end with:

-> D -> E -> F -> several commits from old master -> HEAD (of new master)

So it seems to be cherry-picks + rebase master on new HEAD but I
am not sure at how things are doing :)

Thank you
-- 
Xavier