git apply changes from one commit onto another branch

git rebase cherry-pick git-cherry-pick
juniper- picture juniper- · Jun 12, 2013 · Viewed 18k times · Source

I want to do something similar to git rebase but without collapsing parallel commits.

Let's say I have the following commits:

  B (bar)
 /
A-C-D (foo)

Now I want to take the changes that D introduced to C in branch foo, and apply them to B in branch bar. so that I end up with the following:

  B-E (bar)
 /
A-C-D (foo)

Where the difference between commits B and E is equal to difference between commits C and D. Is this possible? Is there a way to do it without creating a patch?

Answer

cforbish picture cforbish · Jun 12, 2013

Yes:

git checkout -b mergebranch B
git cherry-pick D

Related questions

git cherry-pick says "...38c74d is a merge but no -m option was given"

I made some changes in my master branch and want to bring those upstream. when I cherry-pick the following commits however I get stuck on fd9f578 where git says: $ git cherry-pick fd9f578 fatal: Commit fd9f57850f6b94…

Read More
Git workflow and Gerrit

I am trying to implement a 'git-flow' kind of workflow using Gerrit but I can't seem to figure out the last piece of the puzzle. There are two preconditions to my problem: Gerrit will only perform merging to one branch …

Read More
Squash my last X commits together using Git

How can I squash my last X commits together into one commit using Git?

Read More