Autogenerated HTML docs for v2.42.0-482-g2e8e7

1 files changed, 23 insertions, 23 deletions

diff --git a/git-diff-tree.html b/git-diff-tree.html
index d2f41be8a..54ca361f9 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -759,7 +759,7 @@ git-diff-tree(1) Manual Page
 <div class="sect1">

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>Compares the content and mode of the blobs found via two tree objects.</p></div>

+<div class="paragraph"><p>Compare the content and mode of blobs found via two tree objects.</p></div>

 <div class="paragraph"><p>If there is only one &lt;tree-ish&gt; given, the commit is compared with its parents

 (see --stdin below).</p></div>

 <div class="paragraph"><p>Note that <em>git diff-tree</em> can use the tree encapsulated in a commit object.</p></div>

@@ -1794,7 +1794,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 <p>

         Discard the files before the named &lt;file&gt; from the output

         (i.e. <em>skip to</em>), or move them to the end of the output

-        (i.e. <em>rotate to</em>).  These were invented primarily for use

+        (i.e. <em>rotate to</em>).  These options were invented primarily for the use

         of the <code>git difftool</code> command, and may not be very useful

         otherwise.

 </p>

@@ -2077,7 +2077,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 </dt>

 <dd>

 <p>

-        recurse into sub-trees

+        Recurse into sub-trees.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -2085,7 +2085,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 </dt>

 <dd>

 <p>

-        show tree entry itself as well as subtrees.  Implies -r.

+        Show tree entry itself as well as subtrees.  Implies -r.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -2148,7 +2148,7 @@ commits (but not trees).</p></div>
         By default, <em>git diff-tree --stdin</em> shows differences,

         either in machine-readable form (without <code>-p</code>) or in patch

         form (with <code>-p</code>).  This output can be suppressed.  It is

-        only useful with <code>-v</code> flag.

+        only useful with the <code>-v</code> flag.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -2241,7 +2241,7 @@ people using 80-column terminals.</p></div>
 <dd>

 <p>

         Perform a tab expansion (replace each tab with enough spaces

-        to fill to the next display column that is multiple of <em>&lt;n&gt;</em>)

+        to fill to the next display column that is a multiple of <em>&lt;n&gt;</em>)

         in the log message before showing it in the output.

         <code>--expand-tabs</code> is a short-hand for <code>--expand-tabs=8</code>, and

         <code>--no-expand-tabs</code> is a short-hand for <code>--expand-tabs=0</code>,

@@ -2268,7 +2268,7 @@ environment overrides). See <a href="git-config.html">git-config(1)</a> for more
 <div class="paragraph"><p>With an optional <em>&lt;ref&gt;</em> argument, use the ref to find the notes

 to display.  The ref can specify the full refname when it begins

 with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise

-<code>refs/notes/</code> is prefixed to form a full name of the ref.</p></div>

+<code>refs/notes/</code> is prefixed to form the full name of the ref.</p></div>

 <div class="paragraph"><p>Multiple --notes options can be combined to control which notes are

 being displayed. Examples: "--notes=foo" will show only notes from

 "refs/notes/foo"; "--notes=foo --notes" will show both notes from

@@ -2348,10 +2348,10 @@ being displayed. Examples: "--notes=foo" will show only notes from
         This flag changes the way a merge commit patch is displayed,

         in a similar way to the <code>-c</code> option. It implies the <code>-c</code>

         and <code>-p</code> options and further compresses the patch output

-        by omitting uninteresting hunks whose the contents in the parents

+        by omitting uninteresting hunks whose contents in the parents

         have only two variants and the merge result picks one of them

         without modification.  When all hunks are uninteresting, the commit

-        itself and the commit log message is not shown, just like in any other

+        itself and the commit log message are not shown, just like in any other

         "empty diff" case.

 </p>

 </dd>

@@ -3696,7 +3696,7 @@ diff format:</p></div>
 <div class="olist arabic"><ol class="arabic">

 <li>

 <p>

-It is preceded with a "git diff" header that looks like this:

+It is preceded by a "git diff" header that looks like this:

 </p>

 <div class="literalblock">

 <div class="content">

@@ -3705,9 +3705,9 @@ It is preceded with a "git diff" header that looks like this:
 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is

 involved.  Especially, even for a creation or a deletion,

 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>

-<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the

+<div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the

 name of the source file of the rename/copy and the name of

-the file that rename/copy produces, respectively.</p></div>

+the file that the rename/copy produces, respectively.</p></div>

 </li>

 <li>

 <p>

@@ -3768,7 +3768,7 @@ rename to a</code></pre>
 <p>

 Hunk headers mention the name of the function to which the hunk

     applies.  See "Defining a custom hunk-header" in

-    <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor to this to

+    <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor this to

     specific languages.

 </p>

 </li>

@@ -3783,7 +3783,7 @@ produce a <em>combined diff</em> when showing a merge. This is the default
 format when showing merges with <a href="git-diff.html">git-diff(1)</a> or

 <a href="git-show.html">git-show(1)</a>. Note also that you can give suitable

 <code>--diff-merges</code> option to any of these commands to force generation of

-diffs in specific format.</p></div>

+diffs in a specific format.</p></div>

 <div class="paragraph"><p>A "combined diff" format looks like this:</p></div>

 <div class="listingblock">

 <div class="content">

@@ -3818,7 +3818,7 @@ index fabadb8,cc95eb0..4866510
 <div class="olist arabic"><ol class="arabic">

 <li>

 <p>

-It is preceded with a "git diff" header, that looks like

+It is preceded by a "git diff" header, that looks like

      this (when the <code>-c</code> option is used):

 </p>

 <div class="literalblock">

@@ -3845,25 +3845,25 @@ deleted file mode &lt;mode&gt;,&lt;mode&gt;</code></pre>
 </div></div>

 <div class="paragraph"><p>The <code>mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;</code> line appears only if at least one of

 the &lt;mode&gt; is different from the rest. Extended headers with

-information about detected contents movement (renames and

-copying detection) are designed to work with diff of two

+information about detected content movement (renames and

+copying detection) are designed to work with the diff of two

 &lt;tree-ish&gt; and are not used by combined diff format.</p></div>

 </li>

 <li>

 <p>

-It is followed by two-line from-file/to-file header

+It is followed by a two-line from-file/to-file header:

 </p>

 <div class="literalblock">

 <div class="content">

 <pre><code>--- a/file

 +++ b/file</code></pre>

 </div></div>

-<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff

+<div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff

 format, <code>/dev/null</code> is used to signal created or deleted

 files.</p></div>

 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a

-two-line from-file/to-file you get a N+1 line from-file/to-file header,

-where N is the number of parents in the merge commit</p></div>

+two-line from-file/to-file, you get an N+1 line from-file/to-file header,

+where N is the number of parents in the merge commit:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><code>--- a/file

@@ -3906,7 +3906,7 @@ added, from the point of view of that parent).</p></div>
 <div class="paragraph"><p>In the above example output, the function signature was changed

 from both files (hence two <code>-</code> removals from both file1 and

 file2, plus <code>++</code> to mean one line that was added does not appear

-in either file1 or file2).  Also eight other lines are the same

+in either file1 or file2).  Also, eight other lines are the same

 from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>

 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a

 merge commit with the merge result (i.e. file1..fileN are the

@@ -4044,7 +4044,7 @@ the pathname, but if that is <code>NUL</code>, the record will show two paths.</
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-12-10 14:52:02 PST

+ 2023-10-23 14:43:46 PDT

 </div>

 </div>

 </body>