@b0rk One other place where I find git cli to be confusing/insufficient is for viewing log graph. The lines of different branches seem so hard to keep track of. Currently I rely on gitlab's graph visualization when possible or use gitk in rare cases.

Recently found this vim plugin which looks good enough such that I'm planning to give it a try: https://github.com/rbong/vim-flog