If you are into Emacs, magit is rather awesome. Yes, it can do line-by-line commits (you can commit highlighted text).