Merge branch 'jc/post-simplify' into tr/filter-branch

* jc/post-simplify: Topo-sort before --simplify-merges revision traversal: show full history with merge simplification revision.c: whitespace fix