Not sure about other editors, but Magit's hunk- and line-level staging/unstaging is hard to beat, IMO. For hunk-level staging, you put your cursor on the hunk

Not sure about other editors, but Magit's hunk- and line-level staging/unstaging is hard to beat, IMO. For hunk-level staging, you put your cursor on the hunk you want to add and press "s". If you want to split that and only stage a few lines, you just select those lines and press "s". This demo is pretty good I think: https://www.youtube.com/watch?v=rzQEIRRJ2T0 https://www.youtube.com/watch?v=rzQEIRRJ2T0