Git Merge Up to a Commit of Another Branch

For branches that have diverged from a certain point, this is done by going to the receiving branch and issuing the command:

git merge <commit-id>

Reference:

• http://stackoverflow.com/questions/8223103/merge-up-to-a-specific-commit