You can actually stage and unstage hunks from a diff view. With a diff view open, you can press + or - to increase or decrease hunk size, n/p and N/P for next/p

You can actually stage and unstage hunks from a diff view. With a diff view open, you can press + or - to increase or decrease hunk size, n/p and N/P for next/previous hunk/file, and s/u for stage and unstage. Rebase is one of the big ones coming up.