summaryrefslogtreecommitdiffstats
path: root/git-diff-tree.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-10 15:15:09 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-10 15:15:09 -0800
commitb48968522932c1f3142591d9f2a3421833de78af (patch)
tree648febe954b673570a636b2b19ac76b570cb67c2 /git-diff-tree.html
parent59e8824741436987ea088ff1f3c7c82d6fe48fc9 (diff)
downloadgit-htmldocs-b48968522932c1f3142591d9f2a3421833de78af.tar.gz
Autogenerated HTML docs for v2.24.1-485-gad05a
Diffstat (limited to 'git-diff-tree.html')
-rw-r--r--git-diff-tree.html49
1 files changed, 40 insertions, 9 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html
index 381df6a56..ec441e0b3 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -2103,7 +2103,7 @@ commits (but not trees).</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.
@@ -2307,7 +2307,7 @@ being displayed. Examples: "--notes=foo" will show only notes from
<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
@@ -2326,7 +2326,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>
@@ -2336,7 +2336,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">
@@ -2350,7 +2350,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>
@@ -2369,7 +2369,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>
@@ -2388,7 +2388,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;
@@ -2405,11 +2405,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>
@@ -2424,7 +2439,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
@@ -2766,6 +2781,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>
@@ -2865,6 +2888,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>