[shock]

> Graphs of non-linear history, “train tracks”, can be intimidating. They certainly felt that way to me to begin with, but there’s no reason to be scared of them. There are many magnificent tools that can analyse and visualise complex Git history, both GUI- and CLI-based.

It's a pity the author doesn't mention some of those magnificent tools. Some tools I know/use:

  CLI: tig
  GUI: gitg, qgit (Linux)

Any others?

[ajdlinux]

Regular old gitk is one of the few tools that I find performant-enough to use on the Linux kernel tree.

[xaedes]

The only git tool that really stuck with me was "SmartGit". Great log view and rebasing/reordering and squashing of commits with drag and drop. I never have to use anything else^^

[tekacs]

For Mac users, there's http://gitup.co/ (I'm not affiliated and it's FOSS).

GitUp is beautiful, incredibly fast and you operate directly on the (well laid-out) graph for almost everything, so you're always acutely aware of the commit history.

(I mostly use Windows + Linux at the moment and this is probably the piece of software I miss the most, even though I prefer shell for absolutely everything else)

[anonred]

+1 for GitUp. Only annoyance is that it can be slow when staging/unstaging lots of files.

[hashhar]

If you use VSCode, there's a great extension called GitLens and GitHistory Log. The combination of them makes browsing repository histories, resolving conflicts and tracking changes really easy and fast.