Merge branch 'js/rebase-i-progress-tidy'

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index fd86ed12dc97df66fda44bdae85f1d260294bf54..a779c9dfec0ed962e7274577b1c53daa0ecff1d9 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -193,7 +193,7 @@ endif::git-rev-list[]
 
 --stdin::
        In addition to the '<commit>' listed on the command
-       line, read them from the standard input. If a '--' separator is
+       line, read them from the standard input. If a `--` separator is
        seen, stop reading commits and start reading paths to limit the
        result.
 
@@ -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[]
 
 --
@@ -746,7 +750,11 @@ format, often found in email messages.
 +
 `--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
 +
-`--date=raw` shows the date in the internal raw Git format `%s %z` format.
+`--date=raw` shows the date as seconds since the epoch (1970-01-01
+00:00:00 UTC), followed by a space, and then the timezone as an offset
+from UTC (a `+` or `-` with four digits; the first two are hours, and
+the second two are minutes). I.e., as if the timestamp were formatted
+with `strftime("%s %z")`).
 Note that the `-local` option does not affect the seconds-since-epoch
 value (which is always measured in UTC), but does switch the accompanying
 timezone value.