How do you accurately reflect the history of development when it's nonlinear? I was an hg person too, but I came over to the git side when I needed to collabor

How do you accurately reflect the history of development when it's nonlinear? I was an hg person too, but I came over to the git side when I needed to collaborate with people. git's killer feature is merges. And merges benefit from fine-grained commits that rewrite history.