@b0rk magit is my git tool of choice.