Version Control with Git: Powerful tools and techniques for collaborative software development

Category: Programming
Author: Jon Loeliger, Matthew McCullough
This Year Stack Overflow 1
This Month Stack Overflow 1


by anonymous   2018-03-19

This quote is taken from; Version Control with Git (Really great book, I encourage you to buy it if you are interested in git)

Edit: Since this answer is still getting impression, I would like to add very nice in action video tutorial about it:

Youtube: Introduction to Git cherry-pick

Using git cherry-pick The command git cherry-pick commit applies the changes introduced by the named commit on the current branch. It will introduce a new, distinct commit. Strictly speaking, using git cherry-pick doesn’t alter the existing history within a repository; instead, it adds to the history. As with other Git operations that introduce changes via the process of applying a diff, you may need to resolve conflicts to fully apply the changes from the given commit . The command git cherry-pick is typically used to introduce particular commits from one branch within a repository onto a different branch. A common use is to forward- or back-port commits from a maintenance branch to a development branch.

$ git checkout rel_2.3
$ git cherry-pick dev~2 # commit F, above

before: before

after: after