From: Jeff King <peff@peff.net>
Date: Tue, 08 Apr 2014 19:53:09 GMT
Subject: Re: Changes based on a branch not yet merged back to master
Message-ID: <20140408195309.GA8461@sigill.intra.peff.net>
In-Reply-To: <1396981364.85181.YahooMailNeo@web121903.mail.ne1.yahoo.com>

On Tue, Apr 08, 2014 at 11:22:44AM -0700, K. Kwan wrote:

> My tree would look like this:
> 
> - x - x - x (master) 
> 
>        \ x - x (A) x - x (B)
> 
> 
> But after merge of branch (A), I would like it to look like this:
> 
> - x - x - x ---- x (master)
>        \        / \
>         x - x (A)  x - x (B)
> 
> 
> Perhaps this?
> 
> $ git checkout master
> $ git pull origin master
> $ git merge A
> $ git rebase --onto master A B

Yes, that should work. I think you could even just do:

  git rebase master B

since after the merge, all of A is contained in master (and so will be
omitted from the rebased commits).

-Peff