If you want a straight-forward mental model that works with git, try Gitless. Note, you will end up learning some new commands that simplify things, and you'll

If you want a straight-forward mental model that works with git, try Gitless. Note, you will end up learning some new commands that simplify things, and you'll have to re-learn git if you work for someone that wants you to use the nitty-gritty, but every convenience has it's downside, and you just have to weigh that against the immediate benefits. Edit: Thanks to lyall for the links. He posted below. [1]: http://gitless.com/ http://gitless.com/ [2]: https://people.csail.mit.edu/sperezde/oopsla16.pdf https://people.csail.mit.edu/sperezde/oopsla16.pdf