Check out jj, it's made by someone who works on Google's source control

https://github.com/martinvonz/jj