My current workflow makes extensive use of these commands:

  git add --patch
  git commit -v

The --patch option allows you to interactively select which changes to add to the index. It also applies to other commands like checkout or reset.

The -v flag shows a diff of what will be committed in the editor.