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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html