I would recommend tig for this sort of thing: http://jonas.nitro.dk/tig/ In fact, I can't recommend it highly enough. It's typically just as necessary as git on any machine I'm working on.