Gitbutler is ridiculously cool and well considered. Definitely worth checking out.