Autogenerated HTML docs for v2.24.1-485-gad05a

1 files changed, 42 insertions, 10 deletions

diff --git a/git-log.html b/git-log.html
index 91eaf58e2..69a20bc63 100644
--- a/git-log.html
+++ b/git-log.html
@@ -1384,7 +1384,7 @@ list.</p></div>
         exclude (that is, <em>&#94;commit</em>, <em>commit1..commit2</em>,

         and <em>commit1...commit2</em> notations cannot be used).

 </p>

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

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

 this causes the output to have two extra lines of information

 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

@@ -1422,6 +1422,7 @@ Otherwise, show the index format.
 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>

+<div class="paragraph"><p>Under <code>--pretty=reference</code>, this information will not be shown at all.</p></div>

 </dd>

 <dt class="hdlist1">

 --merge

@@ -1915,7 +1916,7 @@ together.</p></div>
 <p>

         Pretty-print the contents of the commit logs in a given format,

         where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,

-        <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em>, <em>format:&lt;string&gt;</em>

+        <em>full</em>, <em>fuller</em>, <em>reference</em>, <em>email</em>, <em>raw</em>, <em>format:&lt;string&gt;</em>

         and <em>tformat:&lt;string&gt;</em>.  When <em>&lt;format&gt;</em> is none of the above,

         and has <em>%placeholder</em> in it, it acts as if

         <em>--pretty=tformat:&lt;format&gt;</em> were given.

@@ -2298,7 +2299,7 @@ options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> fo
 <div class="paragraph"><p>If the commit is a merge, and if the pretty-format

 is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is

 inserted before the <em>Author:</em> line.  This line begins with

-"Merge: " and the sha1s of ancestral commits are printed,

+"Merge: " and the hashes of ancestral commits are printed,

 separated by spaces.  Note that the listed commits may not

 necessarily be the list of the <strong>direct</strong> parent commits if you

 have limited your view of history: for example, if you are

@@ -2317,7 +2318,7 @@ built-in formats:</p></div>
 </p>

 <div class="literalblock">

 <div class="content">

-<pre><code>&lt;sha1&gt; &lt;title line&gt;</code></pre>

+<pre><code>&lt;hash&gt; &lt;title line&gt;</code></pre>

 </div></div>

 <div class="paragraph"><p>This is designed to be as compact as possible.</p></div>

 </li>

@@ -2327,7 +2328,7 @@ built-in formats:</p></div>
 </p>

 <div class="literalblock">

 <div class="content">

-<pre><code>commit &lt;sha1&gt;

+<pre><code>commit &lt;hash&gt;

 Author: &lt;author&gt;</code></pre>

 </div></div>

 <div class="literalblock">

@@ -2341,7 +2342,7 @@ Author: &lt;author&gt;</code></pre>
 </p>

 <div class="literalblock">

 <div class="content">

-<pre><code>commit &lt;sha1&gt;

+<pre><code>commit &lt;hash&gt;

 Author: &lt;author&gt;

 Date:   &lt;author date&gt;</code></pre>

 </div></div>

@@ -2360,7 +2361,7 @@ Date:   &lt;author date&gt;</code></pre>
 </p>

 <div class="literalblock">

 <div class="content">

-<pre><code>commit &lt;sha1&gt;

+<pre><code>commit &lt;hash&gt;

 Author: &lt;author&gt;

 Commit: &lt;committer&gt;</code></pre>

 </div></div>

@@ -2379,7 +2380,7 @@ Commit: &lt;committer&gt;</code></pre>
 </p>

 <div class="literalblock">

 <div class="content">

-<pre><code>commit &lt;sha1&gt;

+<pre><code>commit &lt;hash&gt;

 Author:     &lt;author&gt;

 AuthorDate: &lt;author date&gt;

 Commit:     &lt;committer&gt;

@@ -2396,11 +2397,26 @@ CommitDate: &lt;committer date&gt;</code></pre>
 </li>

 <li>

 <p>

+<em>reference</em>

+</p>

+<div class="literalblock">

+<div class="content">

+<pre><code>&lt;abbrev hash&gt; (&lt;title line&gt;, &lt;short author date&gt;)</code></pre>

+</div></div>

+<div class="paragraph"><p>This format is used to refer to another commit in a commit message and

+is the same as <code>--pretty='format:%C(auto)%h (%s, %ad)'</code>.  By default,

+the date is formatted with <code>--date=short</code> unless another <code>--date</code> option

+is explicitly specified.  As with any <code>format:</code> with format

+placeholders, its output is not affected by other options like

+<code>--decorate</code> and <code>--walk-reflogs</code>.</p></div>

+</li>

+<li>

+<p>

 <em>email</em>

 </p>

 <div class="literalblock">

 <div class="content">

-<pre><code>From &lt;sha1&gt; &lt;date&gt;

+<pre><code>From &lt;hash&gt; &lt;date&gt;

 From: &lt;author&gt;

 Date: &lt;author date&gt;

 Subject: [PATCH] &lt;title line&gt;</code></pre>

@@ -2415,7 +2431,7 @@ Subject: [PATCH] &lt;title line&gt;</code></pre>
 <em>raw</em>

 </p>

 <div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as

-stored in the commit object.  Notably, the SHA-1s are

+stored in the commit object.  Notably, the hashes are

 displayed in full, regardless of whether --abbrev or

 --no-abbrev are used, and <em>parents</em> information show the

 true parent commits, without taking grafts or history

@@ -2757,6 +2773,14 @@ author date, strict ISO 8601 format
 </p>

 </dd>

 <dt class="hdlist1">

+<em>%as</em>

+</dt>

+<dd>

+<p>

+author date, short format (<code>YYYY-MM-DD</code>)

+</p>

+</dd>

+<dt class="hdlist1">

 <em>%cn</em>

 </dt>

 <dd>

@@ -2856,6 +2880,14 @@ committer date, strict ISO 8601 format
 </p>

 </dd>

 <dt class="hdlist1">

+<em>%cs</em>

+</dt>

+<dd>

+<p>

+committer date, short format (<code>YYYY-MM-DD</code>)

+</p>

+</dd>

+<dt class="hdlist1">

 <em>%d</em>

 </dt>

 <dd>