threads / discuss / 36371

Changes based on a branch not yet merged back to master

Subject: Changes based on a branch not yet merged back to master

## tl;dr

2 messages between Apr 8, 2014 and Apr 8, 2014.

replies: 1people: 2as markdown or json

K. Kwan· Apr 8, 2014, 18:22 UTC · lore
I have a feature branch (A) containing changes awaiting code review. I now need to begin work on new feature (B) that is dependent on new files and changes made in branch (A).
Is there "proper" way to rebase just the changes made in branch (B) back onto master (M) branch resulting from the merge of branch (A)
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

Regards.
Jeff King· Apr 8, 2014, 19:53 UTC · re: K. Kwan · lore

Re: Changes based on a branch not yet merged back to master

On Tue, Apr 08, 2014 at 11:22:44AM -0700, K. Kwan wrote:
Show 20 quoted lines
> 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

← back to recent threads