How to stage what "git commit -a" stages but not commit it?
When I repair merge conflicts in rebasing, I need to stage the modified files before git rebase --continue and git tells me to use git add. Otherwise I use git commit -a --amend in rebasing before continuing and it stages all modified files automatically. I don't want to stage untracked files.