Git
From DarkWiki
Cherry picking
If you need to merge in a single commit into your current branch, you can make use of git cherry-pick. For example, if you wish to merge in commit "1237645187234781fqcfewfe", you need only issue the following command:
git cherry-pick 1237645187234781fqcfewfe