Merge branch 'maint'

* maint:
Re-fix rev-list-options documentation

diff --combined Documentation/rev-list-options.txt
index 9e207136649421bd1ff211a137769b2eccf813ba,c953d1cac53412c08870d013e2db5e22b8e6fe6e..be847217814690f08f5ffeb8f4d508d0abfacf15
--- 1/Documentation/rev-list-options.txt
--- 2/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -45,10 -45,6 +45,10 @@@ endif::git-rev-list[
  
        Print the parents of the commit.
  
 +--children::
 +
 +      Print the children of the commit.
 +
  ifdef::git-rev-list[]
  --timestamp::
        Print the raw commit timestamp.
@@@ -267,8 -263,7 +267,7 @@@ used in the output.  When the starting 
  '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::