$ git log path/to/file
$ git checkout <branch to merge into>
$ git cherry-pick -x <commit sha>