Magit of course also solves this very nicely.