[phaemon]

Actually, if that's all you want, you can do:

  git add <file>
  # or "git rm --cached <file>" to remove
  git commit --amend

and it will replace with a new commit that has what you want. It's like a mini rebase -i

[p4bl0]

True, but I prefer to be able to see my staged changes as a whole to be sure that I did everything as I wanted.