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

Changes based on a branch not yet merged back to master

From
KKK. Kwan <kkwansj_888@yahoo.com>
Date
Apr 8, 2014, 18:22 UTC
Message-ID
<1396981364.85181.YahooMailNeo@web121903.mail.ne1.yahoo.com>
In-Reply-To
<1396956140.85747.YahooMailNeo@web121901.mail.ne1.yahoo.com>
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.
Next: Jeff King
Message 1 of 2 in “Changes based on a branch not yet merged back to master”
  1. K. KwanApr 8, 2014
  2. Jeff KingApr 8, 2014

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.