How about `git add --patch -all` to make it interactive? I have that aliased to `gap` and it is probably my most used git command.