summaryrefslogtreecommitdiffstats
path: root/git-fsck.html
diff options
context:
space:
mode:
Diffstat (limited to 'git-fsck.html')
-rw-r--r--git-fsck.html34
1 files changed, 17 insertions, 17 deletions
diff --git a/git-fsck.html b/git-fsck.html
index d118d5a31..148c3b9c8 100644
--- a/git-fsck.html
+++ b/git-fsck.html
@@ -775,7 +775,7 @@ git-fsck(1) Manual Page
An object to treat as the head of an unreachability trace.
</p>
<div class="paragraph"><p>If no objects are given, <em>git fsck</em> defaults to using the
-index file, all SHA-1 references in <code>refs</code> namespace, and all reflogs
+index file, all SHA-1 references in the <code>refs</code> namespace, and all reflogs
(unless --no-reflogs is given) as heads.</p></div>
</dd>
<dt class="hdlist1">
@@ -854,7 +854,7 @@ index file, all SHA-1 references in <code>refs</code> namespace, and all reflogs
<p>
Check only the connectivity of reachable objects, making sure
that any objects referenced by a reachable tag, commit, or tree
- is present. This speeds up the operation by avoiding reading
+ are present. This speeds up the operation by avoiding reading
blobs entirely (though it does still check that referenced blobs
exist). This will detect corruption in commits and trees, but
not do any semantic checks (e.g., for format errors). Corruption
@@ -873,7 +873,7 @@ care about this output and want to speed it up further.</p></div>
recorded with g+w bit set, which was created by older
versions of Git. Existing repositories, including the
Linux kernel, Git itself, and sparse repository have old
- objects that triggers this check, but it is recommended
+ objects that trigger this check, but it is recommended
to check new projects with this flag.
</p>
</dd>
@@ -945,12 +945,12 @@ to accept pushes of such data set <code>receive.fsck.&lt;msg-id&gt;</code> inste
to clone or fetch it set <code>fetch.fsck.&lt;msg-id&gt;</code>.</p></div>
<div class="paragraph"><p>The rest of the documentation discusses <code>fsck.*</code> for brevity, but the
same applies for the corresponding <code>receive.fsck.*</code> and
-<code>fetch.&lt;msg-id&gt;.*</code>. variables.</p></div>
-<div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code> the
+<code>fetch.fsck.*</code>. variables.</p></div>
+<div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code>, the
<code>receive.fsck.&lt;msg-id&gt;</code> and <code>fetch.fsck.&lt;msg-id&gt;</code> variables will not
fall back on the <code>fsck.&lt;msg-id&gt;</code> configuration if they aren&#8217;t set. To
-uniformly configure the same fsck settings in different circumstances
-all three of them they must all set to the same values.</p></div>
+uniformly configure the same fsck settings in different circumstances,
+all three of them must be set to the same values.</p></div>
<div class="paragraph"><p>When <code>fsck.&lt;msg-id&gt;</code> is set, errors can be switched to warnings and
vice versa by configuring the <code>fsck.&lt;msg-id&gt;</code> setting where the
<code>&lt;msg-id&gt;</code> is the fsck message ID and the value is one of <code>error</code>,
@@ -965,7 +965,7 @@ allow new instances of the same breakages go unnoticed.</p></div>
<div class="paragraph"><p>Setting an unknown <code>fsck.&lt;msg-id&gt;</code> value will cause fsck to die, but
doing the same for <code>receive.fsck.&lt;msg-id&gt;</code> and <code>fetch.fsck.&lt;msg-id&gt;</code>
will only cause git to warn.</p></div>
-<div class="paragraph"><p>See <code>Fsck Messages</code> section of <a href="git-fsck.html">git-fsck(1)</a> for supported
+<div class="paragraph"><p>See the <code>Fsck Messages</code> section of <a href="git-fsck.html">git-fsck(1)</a> for supported
values of <code>&lt;msg-id&gt;</code>.</p></div>
</dd>
<dt class="hdlist1">
@@ -975,12 +975,12 @@ fsck.skipList
<p>
The path to a list of object names (i.e. one unabbreviated SHA-1 per
line) that are known to be broken in a non-fatal way and should
- be ignored. On versions of Git 2.20 and later comments (<em>#</em>), empty
- lines, and any leading and trailing whitespace is ignored. Everything
+ be ignored. On versions of Git 2.20 and later, comments (<em>#</em>), empty
+ lines, and any leading and trailing whitespace are ignored. Everything
but a SHA-1 per line will error out on older versions.
</p>
<div class="paragraph"><p>This feature is useful when an established project should be accepted
-despite early commits containing errors that can be safely ignored
+despite early commits containing errors that can be safely ignored,
such as invalid committer email addresses. Note: corrupt objects
cannot be skipped with this setting.</p></div>
<div class="paragraph"><p>Like <code>fsck.&lt;msg-id&gt;</code> this variable has corresponding
@@ -988,10 +988,10 @@ cannot be skipped with this setting.</p></div>
<div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code> the
<code>receive.fsck.skipList</code> and <code>fetch.fsck.skipList</code> variables will not
fall back on the <code>fsck.skipList</code> configuration if they aren&#8217;t set. To
-uniformly configure the same fsck settings in different circumstances
-all three of them they must all set to the same values.</p></div>
+uniformly configure the same fsck settings in different circumstances,
+all three of them must be set to the same values.</p></div>
<div class="paragraph"><p>Older versions of Git (before 2.20) documented that the object names
-list should be sorted. This was never a requirement, the object names
+list should be sorted. This was never a requirement; the object names
could appear in any order, but when reading the list we tracked whether
the list was sorted for the purposes of an internal binary search
implementation, which could save itself some work with an already sorted
@@ -1423,7 +1423,7 @@ by setting the corresponding <code>fsck.&lt;msg-id&gt;</code> configuration vari
</dt>
<dd>
<p>
- (ERROR) Missing space before the email in author/committer line.
+ (ERROR) Missing space before the email in an author/committer line.
</p>
</dd>
<dt class="hdlist1">
@@ -1535,7 +1535,7 @@ by setting the corresponding <code>fsck.&lt;msg-id&gt;</code> configuration vari
</dt>
<dd>
<p>
- (ERROR) Found a zero padded date in an author/commiter line.
+ (ERROR) Found a zero padded date in an author/committer line.
</p>
</dd>
<dt class="hdlist1">
@@ -1591,7 +1591,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES
<div id="footer">
<div id="footer-text">
Last updated
- 2022-11-04 21:49:36 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>