Almost exclusively a command-line user too. The one GUI tool I sometimes use is tig -- I like its status view for staging parts of files at a time if I made too many changes at once.