If you need to merge in a single commit into your current branch, you can make use of git cherry-pick.
