Used  "git  add -e" once more. I admit, I rarely *need* it. But when I
  do, it feels like the most useful feature I've ever  seen  in  a  VCS.
  Saved me a hell lot of time.