How do I tell git to merge a single program from an old commit into the current version of that program in the HEAD commit? In this scenario, I want to get back some removed code but still keep the new code. e.g. Commit-1 = initial commit containing Program-A, and other programs Commit-2 = add Changeset-1 to Program-A , and make changes to other programs Commit-3 = remove Changeset-1 from Program-A, then add Changeset-2 to Program-A, and make changes to other programs *desired* Commit-4 = only merge Program-A from Commit-2 into Program-A of Commit-3, and don't change any other programs (in other words, get my old changes from Commit-2 back, but don't loose the new changes from Commit-3) v/r, Neal -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html