Sherlock: The Empty Hearse

This season 3, episode 1 was based on the short story "The Adventure of the Empty House". The main similarity is that Sherlock "comes back from the dead." In the short story, Sherlock and Watson then stake out an empty house to trap Sherlock's would-be assassins. They capture them, and Sherlock is safe. Also, in both Sherlock disguises himself to surprise Watson with his "resurrection".