From: Johannes Sixt <j.sixt@eudaptics.com>
Date: Mon, 12 Mar 2007 17:11:27 GMT
Subject: Re: What's the best method between merging and rebasing ?
Message-ID: <45F589BF.28E3A5AD@eudaptics.com>
In-Reply-To: <200703121634.l2CGYtGx027263@localhost.localdomain>

Xavier Maillard wrote:
> -> 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.

-- Hannes