Merge branch 'jk/diff-blob' into maint

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index eac982cd667b3f6199662b1792976750224b48e9..a02f7324c01ee5811441d2a6dcb93aafd892298c 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -133,8 +133,8 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
        for all following revision specifiers, up to the next `--not`.
 
 --all::
-       Pretend as if all the refs in `refs/` are listed on the
-       command line as '<commit>'.
+       Pretend as if all the refs in `refs/`, along with `HEAD`, are
+       listed on the command line as '<commit>'.
 
 --branches[=<pattern>]::
        Pretend as if all the refs in `refs/heads` are listed
@@ -225,7 +225,7 @@ excluded from the output.
 
 --left-only::
 --right-only::
-       List only commits on the respective side of a symmetric range,
+       List only commits on the respective side of a symmetric difference,
        i.e. only those which would be marked `<` resp. `>` by
        `--left-right`.
 +
@@ -289,6 +289,10 @@ ifdef::git-rev-list[]
        Try to speed up the traversal using the pack bitmap index (if
        one is available). Note that when traversing with `--objects`,
        trees and blobs will not have their associated path printed.
+
+--progress=<header>::
+       Show progress reports on stderr as objects are considered. The
+       `<header>` text will be printed with each progress update.
 endif::git-rev-list[]
 
 --
@@ -653,8 +657,9 @@ avoid showing the commits from two parallel development track mixed
 together.
 
 --reverse::
-       Output the commits in reverse order.
-       Cannot be combined with `--walk-reflogs`.
+       Output the commits chosen to be shown (see Commit Limiting
+       section above) in reverse order. Cannot be combined with
+       `--walk-reflogs`.
 
 Object Traversal
 ~~~~~~~~~~~~~~~~
@@ -792,7 +797,7 @@ ifdef::git-rev-list[]
 endif::git-rev-list[]
 
 --left-right::
-       Mark which side of a symmetric diff a commit is reachable from.
+       Mark which side of a symmetric difference a commit is reachable from.
        Commits from the left side are prefixed with `<` and those from
        the right with `>`.  If combined with `--boundary`, those
        commits are prefixed with `-`.