Emacs/Magit can do that sort of things easily. You can mark a region in a diff and add that to staging if you want.

Magit is probably the best chrome for Git I personally think.