Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

What's the best method between merging and rebasing ?

From: Xavier Maillard <hidden>
Date: 2016-06-15 22:42:59

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.

How would you do that ?

I think I can't merge directly old master onto new master since
there are several commits I want to drop but what about rebasing
?

I guess I should cherry-pick interesting commits and rebase but I
am not sure.

Help would be greatly appreciated here :)
-- 
Xavier
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help