Merge branch 'maint'

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

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 9e207136649421bd1ff211a137769b2eccf813ba..be847217814690f08f5ffeb8f4d508d0abfacf15 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -267,8 +267,7 @@ used in the output.  When the starting commit is specified as
 '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::