Do a git stash of working dir only after your git add -p. This was how the index/staging was meant to be used... I think