Shout out to SmartGit. Syntevo has being making version control that don't suck for over a decade. Tried and true.