> But i like `git add -p` to skip debug lines, hardcoded conditions, etc

You can use `git commit -p` to get the same functionality but without explicitly using the staging area.