I run a diff of my current branch versus a different one that has some stuff I want:
$ git diff HEAD subscribers_decorator | cat
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 245393c..6a1639a 100644
...
Big 'ol list of stuff I don't want...
Followed by a portion that I do want... Which I manually copy.