Merge branch 'rs/color-escape-has-zero-width'

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 11eec941dff7302ffcd68eca3d6437d31c022ca9..b44fdd9f015d2b5f2877b561c1b07c99bde6c3a8 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -201,6 +201,10 @@ endif::git-rev-list[]
 
        Stop when a given path disappears from the tree.
 
+--merges::
+
+       Print only merge commits.
+
 --no-merges::
 
        Do not print commits with more than one parent.
@@ -239,12 +243,14 @@ endif::git-rev-list[]
        Pretend as if all the refs in `$GIT_DIR/refs/remotes` are listed
        on the command line as '<commit>'.
 
-ifdef::git-rev-list[]
 --stdin::
 
        In addition to the '<commit>' listed on the command
-       line, read them from the standard input.
+       line, read them from the standard input. If a '--' separator is
+       seen, stop reading commits and start reading paths to limit the
+       result.
 
+ifdef::git-rev-list[]
 --quiet::
 
        Don't print anything to standard output.  This form