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

diff --combined Documentation/rev-list-options.txt
index 1d857559ef1327fd33dc5ab0f74e12fd9e3a3e26,ee6822a85df9965901403e99d353fc3c0e1a9eed..67ff0eab9f964470503bb8620e0d7d3b0ccf43ba
--- 1/Documentation/rev-list-options.txt
--- 2/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -71,7 -71,7 +71,7 @@@ For example, if you have this topology
           o---x---a---a  branch A
  -----------------------------------------------------------------------
  +
 -you would get an output line this:
 +you would get an output like this:
  +
  -----------------------------------------------------------------------
        $ git rev-list --left-right --boundary --pretty=oneline A...B
@@@ -193,12 -193,18 +193,18 @@@ endif::git-rev-list[
  
  --full-history::
  
-       Show also parts of history irrelevant to current state of a given
-       path. This turns off history simplification, which removed merges
+       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.
@@@ -264,10 -270,11 +270,10 @@@ With '\--pretty' format other than onel
  this causes the output to have two extra lines of information
  taken from the reflog.  By default, 'commit@\{Nth}' notation is
  used in the output.  When the starting commit is specified as
 -'commit@{now}', output also uses 'commit@\{timestamp}' notation
 +'commit@\{now}', output also uses 'commit@\{timestamp}' notation
  instead.  Under '\--pretty=oneline', the commit message is
  prefixed with this information on the same line.
 -
 -Cannot be combined with '\--reverse'.
 +This option cannot be combined with '\--reverse'.
  See also linkgit:git-reflog[1].
  
  --merge::