git/list[1] front-page[2] threads[3] people[4] search[5] about
 

What's the best method between merging and rebasing ?

From
XMXavier Maillard <zedek@gnu.org>
Date
Mar 12, 2007, 11:39 UTC
Message-ID
<200703121139.l2CBdcUL022906@localhost.localdomain>
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
Next: Pierre Habouzit
Message 1 of 8 in “What's the best method between merging and rebasing ?”
  1. Xavier MaillardMar 12, 2007
  2. Pierre HabouzitMar 12, 2007
  3. Xavier MaillardMar 12, 2007
  4. Johannes SixtMar 12, 2007
  5. Pierre HabouzitMar 12, 2007
  6. Pierre HabouzitMar 12, 2007
  7. Xavier MaillardMar 12, 2007
  8. Pierre HabouzitMar 12, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.