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

diff --cc Documentation/rev-list-options.txt
index 0ce3f7fbd93db297291f08305c1a2b2bf603dcaa,ee6822a85df9965901403e99d353fc3c0e1a9eed..059ae69d8471b4a864056f3f359ba64687a3c688
--- 1/Documentation/rev-list-options.txt
--- 2/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -193,6 -191,20 +193,12 @@@ endif::git-rev-list[
  
        Stop when a given path disappears from the tree.
  
 ---full-history::
 -
 -      Show also parts of history irrelevant to current state of given
 -      paths. This turns off history simplification, which removed merges
 -      which didn't change anything at all at some child. It will still actually
 -      simplify away merges that didn't change anything at all into either
 -      child.
 -
+ --simplify-merges::
+ 
+       Simplify away commits that did not change the given paths, similar
+       to `--full-history`, and further remove merges none of whose
+       parent history changes the given paths.
+ 
  --no-merges::
  
        Do not print commits with more than one parent.