when i have an idempotent sledgehammer (i.e. i can apply it twice and get the same result) i usually just

   git add -p 

everything that is ok. git diff will only show you the differences against the index, so this works as well.