If this is about staging partial file changes, then I think this is where git GUIs especially excel. It's typically a matter of selecting and deselecting individual lines of change. The concept and term "hunk" (to mean a group of lines, and honestly "chunk" would've been a better choice) never shows up. Pretty intuitive and foolproof.
I've used Git Cola on Linux and Github Desktop on Windows. Both free.
I've used Git Cola on Linux and Github Desktop on Windows. Both free.