git cherry-pick <revisionid>
http://stackoverflow.com/questions/3295105/with-git-is-it-possible-to-re-apply-an-ancestor-revision