git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xavier Maillard <zedek@gnu.org>
To: git@vger.kernel.org
Subject: What's the best method between merging and rebasing ?
Date: Mon, 12 Mar 2007 12:39:38 +0100	[thread overview]
Message-ID: <200703121139.l2CBdcUL022906@localhost.localdomain> (raw)

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

             reply	other threads:[~2007-03-12 11:43 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-03-12 11:39 Xavier Maillard [this message]
2007-03-12 12:08 ` What's the best method between merging and rebasing ? Pierre Habouzit
2007-03-12 16:34   ` Xavier Maillard
2007-03-12 17:11     ` Johannes Sixt
2007-03-12 19:43       ` Pierre Habouzit
2007-03-12 17:37     ` Pierre Habouzit
2007-03-12 19:14       ` Xavier Maillard
2007-03-12 19:42         ` Pierre Habouzit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200703121139.l2CBdcUL022906@localhost.localdomain \
    --to=zedek@gnu.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).