see also, https://github.com/martinvonz/jj which I really have been enjoying wrapping my head around and using. True undo, and no-stage is truly such an amazing experience compared with raw git.