Comment by Achshar

I use sourcetree and it's pretty great, especially the aforementioned block-level staging.