summaryrefslogtreecommitdiffstats
path: root/git-ls-files.html
diff options
context:
space:
mode:
Diffstat (limited to 'git-ls-files.html')
-rw-r--r--git-ls-files.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/git-ls-files.html b/git-ls-files.html
index 8462ae45e..8c908bc5c 100644
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -769,11 +769,11 @@ git-ls-files(1) Manual Page
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>This merges the file listing in the index with the actual working
+<div class="paragraph"><p>This command merges the file listing in the index with the actual working
directory list, and shows different combinations of the two.</p></div>
-<div class="paragraph"><p>One or more of the options below may be used to determine the files
+<div class="paragraph"><p>Several flags can be used to determine which files are
shown, and each file may be printed multiple times if there are
-multiple entries in the index or multiple statuses are applicable for
+multiple entries in the index or if multiple statuses are applicable for
the relevant file selection options.</p></div>
</div>
</div>
@@ -842,7 +842,7 @@ the relevant file selection options.</p></div>
matching an exclude pattern. When showing "other" files
(i.e. when used with <em>-o</em>), show only those matched by an
exclude pattern. Standard ignore rules are not automatically
- activated, therefore at least one of the <code>--exclude*</code> options
+ activated; therefore, at least one of the <code>--exclude*</code> options
is required.
</p>
</dd>
@@ -1006,7 +1006,7 @@ the relevant file selection options.</p></div>
Show status tags together with filenames. Note that for
scripting purposes, <a href="git-status.html">git-status(1)</a> <code>--porcelain</code> and
<a href="git-diff-files.html">git-diff-files(1)</a> <code>--name-status</code> are almost always
- superior alternatives, and users should look at
+ superior alternatives; users should look at
<a href="git-status.html">git-status(1)</a> <code>--short</code> or <a href="git-diff.html">git-diff(1)</a>
<code>--name-status</code> for more user-friendly alternatives.
</p>
@@ -1382,7 +1382,7 @@ pattern file appears in.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2023-06-13 13:57:42 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>