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

On Mon, Mar 12, 2007 at 06:11:27PM +0100, Johannes Sixt wrote:

Xavier Maillard wrote:

quoted

-> 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 :)

Just to get the wording straight: You mean "reset master to new HEAD",
not "rebase". "reset" means to point the branch identifier ("master") to
some commit - with or without modifying the working directory
accordingly. OTOH, "rebase" means to re-apply a string of commits on top
of some other commit.

  
  err that was indeed a lapsus from me. Sorry for the mistake, that was
indeed what I intended to say.

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