Rebase feature branch onto another feature branch

GitGit RebaseFeature Branch

Git Problem Overview

I have two (private) feature branches that I'm working on.

a -- b -- c                  <-- Master
     \     \
      \     d -- e           <-- Branch1
       \
        f -- g               <-- Branch2

After working on these branches a little while I've discovered that I need the changes from Branch2 in Branch1. I'd like to rebase the changes in Branch2 onto Branch1. I'd like to end up with the following:

a -- b -- c                  <-- Master
           \
            d -- e -- f -- g <-- Branch1

I'm pretty sure I need to rebase the second branch onto the first, but I'm not entirely sure about the correct syntax and which branch I should have checked out.

Will this command produce the desired result?

(Branch1)$ git rebase --onto Branch1 Branch2

Git Solutions

Solution 1 - Git

  1. Switch to Branch2

     git checkout Branch2

  2. Apply the current (Branch2) changes on top of the Branch1 changes, staying in Branch2:

     git rebase Branch1

Which would leave you with the desired result in Branch2:

a -- b -- c                      <-- Master
           \
            d -- e               <-- Branch1
           \
            d -- e -- f' -- g'   <-- Branch2

You can delete Branch1.

Solution 2 - Git

Note: if you were on Branch1, you will with Git 2.0 (Q2 2014) be able to type:

git checkout Branch2
git rebase -

See commit 4f40740 by Brian Gesiak modocache:

rebase: allow "-" short-hand for the previous branch

> Teach rebase the same shorthand as checkout and merge to name the branch to rebase the current branch on; that is, that "-" means "the branch we were previously on".

Solution 3 - Git

I know you've already accepted the answer, but if you want to do exactly what you asked for (add Branch2's commits on top of Branch1 while staying on Branch1) you can do this:

git checkout Branch1
git cherry-pick master..Branch2

You'll end up with this.

a -- b -- c                      <-- Master
           \
            d -- e -- f' -- g'   <-- Branch1 (current)
           \
            f -- g               <-- Branch2

This will cherry-pick each of the commits on Branch2 in order onto Branch1. Then you can delete Branch2.

Solution 4 - Git

I know you asked to Rebase, but I'd Cherry-Pick the commits I wanted to move from Branch2 to Branch1 instead. That way, I wouldn't need to care about when which branch was created from master, and I'd have more control over the merging.

a -- b -- c                  <-- Master
     \     \
      \     d -- e -- f -- g <-- Branch1 (Cherry-Pick f & g)
       \
        f -- g               <-- Branch2
Categories
Recommended Git Solutions
Recommended Git Rebase Solutions
Recommended Feature Branch Solutions

Previous Solution:

Python 3: ImportError "No Module named Setuptools"

PythonModulePackagesetup.pyPython 3.3

Next Solution:

How can I set focus on an element in an HTML form using JavaScript?

JavascriptHtmlTextboxFocus

Attributions

All content for this solution is sourced from the original question on Stackoverflow.

The content on this page is licensed under the Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) license.

Content TypeOriginal AuthorOriginal Content on Stackoverflow
QuestionArjenView Question on Stackoverflow
Solution 1 - GitsasiktView Answer on Stackoverflow
Solution 2 - GitVonCView Answer on Stackoverflow
Solution 3 - GitAsfand QaziView Answer on Stackoverflow
Solution 4 - GitCraigoView Answer on Stackoverflow