See https://github.com/martinvonz/jj it has much more powerful primitive, better defaults and still compatible with git.