I agree with using SourceTree. I use the CLI for pretty much everything, but sometimes for reversals or complicated merges, I like to visually compare the difference between files to make sure I'm not going to screw something major up.
@cruuuuuuz I'd recommend using whatever makes you more productive, others be damned. I'm way faster with the GUI over the CLI in every way (particularly throwing in Android Studio's in-built VCS system).