Sublime Merge offers a nice GUI for the workflow you're describing with `git add -p`