Merge branch 'jc/post-simplify' into tr/rev-list-docs

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

Conflicts:
Documentation/rev-list-options.txt