[the_gipsy]

I use git-cola for chunk editing, staging, and to preview the commit's diffs of files. It's open source and works on linux, Windows and OSX.