diff options
Diffstat (limited to 'git-diff-index.html')
| -rw-r--r-- | git-diff-index.html | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/git-diff-index.html b/git-diff-index.html index 689d7fda4..238db47ca 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -757,10 +757,10 @@ git-diff-index(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 in a tree object
+<div class="paragraph"><p>Compare the content and mode of the blobs found in a tree object
with the corresponding tracked files in the working tree, or with the
corresponding paths in the index. When <path> arguments are present,
-compares only paths matching those patterns. Otherwise all tracked
+compare only paths matching those patterns. Otherwise all tracked
files are compared.</p></div>
</div>
</div>
@@ -1793,7 +1793,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< <p>
Discard the files before the named <file> 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>
@@ -2362,7 +2362,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">
@@ -2371,9 +2371,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>
@@ -2434,7 +2434,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>
@@ -2449,7 +2449,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">
@@ -2484,7 +2484,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">
@@ -2511,25 +2511,25 @@ deleted file mode <mode>,<mode></code></pre> </div></div>
<div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
the <mode> 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
<tree-ish> 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
@@ -2572,7 +2572,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
@@ -2810,7 +2810,7 @@ always have the special all-zero sha1.</td> <div id="footer">
<div id="footer-text">
Last updated
- 2022-07-11 16:06:18 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
|