I agree that visualisation is key, but ASCII art from `git log --graph` isn't too bad for getting the point across IMHO. Merging/conflicts/etc. are a straightfo

I agree that visualisation is key, but ASCII art from `git log --graph` isn't too bad for getting the point across IMHO. Merging/conflicts/etc. are a straightforward extension of regular `diff` usage, which can be learned in a standalone way before approaching git. Personally I'm in love with Magit which is a thin Emacs wrapper around git.