Autogenerated HTML docs for v2.9.2-664-ga0a18

1 files changed, 54 insertions, 9 deletions

diff --git a/git-rev-list.html b/git-rev-list.html
index 994f8fc40..c6cb2496b 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -1284,10 +1284,39 @@ list.</p></div>
 </p>

 <div class="paragraph"><p>With <code>--pretty</code> format other than <code>oneline</code> (for obvious reasons),

 this causes the output to have two extra lines of information

-taken from the reflog.  By default, <em>commit@{Nth}</em> notation is

-used in the output.  When the starting commit is specified as

-<em>commit@{now}</em>, output also uses <em>commit@{timestamp}</em> notation

-instead.  Under <code>--pretty=oneline</code>, the commit message is

+taken from the reflog.  The reflog designator in the output may be shown

+as <code>ref@{Nth}</code> (where <code>Nth</code> is the reverse-chronological index in the

+reflog) or as <code>ref@{timestamp}</code> (with the timestamp for that entry),

+depending on a few rules:</p></div>

+<div class="openblock">

+<div class="content">

+<div class="olist arabic"><ol class="arabic">

+<li>

+<p>

+If the starting point is specified as <code>ref@{Nth}</code>, show the index

+format.

+</p>

+</li>

+<li>

+<p>

+If the starting point was specified as <code>ref@{now}</code>, show the

+timestamp format.

+</p>

+</li>

+<li>

+<p>

+If neither was used, but <code>--date</code> was given on the command line, show

+the timestamp in the format requested by <code>--date</code>.

+</p>

+</li>

+<li>

+<p>

+Otherwise, show the index format.

+</p>

+</li>

+</ol></div>

+</div></div>

+<div class="paragraph"><p>Under <code>--pretty=oneline</code>, the commit message is

 prefixed with this information on the same line.

 This option cannot be combined with <code>--reverse</code>.

 See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div>

@@ -2034,8 +2063,8 @@ and <em>fuller</em>).</p></div>
         <code>iso-local</code>), the user&#8217;s local time zone is used instead.

 </p>

 <div class="paragraph"><p><code>--date=relative</code> shows dates relative to the current time,

-e.g. &#8220;2 hours ago&#8221;. The <code>-local</code> option cannot be used with

-<code>--raw</code> or <code>--relative</code>.</p></div>

+e.g. &#8220;2 hours ago&#8221;. The <code>-local</code> option has no effect for

+<code>--date=relative</code>.</p></div>

 <div class="paragraph"><p><code>--date=local</code> is an alias for <code>--date=default-local</code>.</p></div>

 <div class="paragraph"><p><code>--date=iso</code> (or <code>--date=iso8601</code>) shows timestamps in a ISO 8601-like format.

 The differences to the strict ISO 8601 format are:</p></div>

@@ -2061,7 +2090,17 @@ ISO 8601 format.</p></div>
 <div class="paragraph"><p><code>--date=rfc</code> (or <code>--date=rfc2822</code>) shows timestamps in RFC 2822

 format, often found in email messages.</p></div>

 <div class="paragraph"><p><code>--date=short</code> shows only the date, but not the time, in <code>YYYY-MM-DD</code> format.</p></div>

-<div class="paragraph"><p><code>--date=raw</code> shows the date in the internal raw Git format <code>%s %z</code> format.</p></div>

+<div class="paragraph"><p><code>--date=raw</code> 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 <code>+</code> or <code>-</code> with four digits; the first two are hours, and

+the second two are minutes). I.e., as if the timestamp were formatted

+with <code>strftime("%s %z")</code>).

+Note that the <code>-local</code> option does not affect the seconds-since-epoch

+value (which is always measured in UTC), but does switch the accompanying

+timezone value.</p></div>

+<div class="paragraph"><p><code>--date=unix</code> shows the date as a Unix epoch timestamp (seconds since

+1970).  As with <code>--raw</code>, this is always in UTC and therefore <code>-local</code>

+has no effect.</p></div>

 <div class="paragraph"><p><code>--date=format:...</code> feeds the format <code>...</code> to your system <code>strftime</code>.

 Use <code>--date=format:%c</code> to show the date in your system locale&#8217;s

 preferred format.  See the <code>strftime</code> manual for a complete list of

@@ -2535,12 +2574,18 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
 </li>

 <li>

 <p>

-<em>%gD</em>: reflog selector, e.g., <code>refs/stash@{1}</code>

+<em>%gD</em>: reflog selector, e.g., <code>refs/stash@{1}</code> or

+  <code>refs/stash@{2 minutes ago</code>}; the format follows the rules described

+  for the <code>-g</code> option. The portion before the <code>@</code> is the refname as

+  given on the command line (so <code>git log -g refs/heads/master</code> would

+  yield <code>refs/heads/master@{0}</code>).

 </p>

 </li>

 <li>

 <p>

-<em>%gd</em>: shortened reflog selector, e.g., <code>stash@{1}</code>

+<em>%gd</em>: shortened reflog selector; same as <code>%gD</code>, but the refname

+  portion is shortened for human readability (so <code>refs/heads/master</code>

+  becomes just <code>master</code>).

 </p>

 </li>

 <li>