Autogenerated HTML docs for v2.42.0-482-g2e8e7

1 files changed, 104 insertions, 104 deletions

diff --git a/git-config.html b/git-config.html
index 31d92b2ed..aaa4e804d 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1578,7 +1578,7 @@ store a per-user configuration as fallback values for the <code>.git/config</cod
 file. The file <code>/etc/gitconfig</code> can be used to store a system-wide

 default configuration.</p></div>

 <div class="paragraph"><p>The configuration variables are used by both the Git plumbing

-and the porcelains. The variables are divided into sections, wherein

+and the porcelain commands. The variables are divided into sections, wherein

 the fully qualified variable name of the variable itself is the last

 dot-separated segment and the section name is everything before the last

 dot. The variable names are case-insensitive, allow only alphanumeric

@@ -1654,7 +1654,7 @@ was found.  See below for examples.</p></div>
 </div>

 <div class="sect2">

 <h3 id="_conditional_includes">Conditional includes</h3>

-<div class="paragraph"><p>You can include a config file from another conditionally by setting a

+<div class="paragraph"><p>You can conditionally include a config file from another by setting an

 <code>includeIf.&lt;condition&gt;.path</code> variable to the name of the file to be

 included.</p></div>

 <div class="paragraph"><p>The condition starts with a keyword followed by a colon and some data

@@ -1671,7 +1671,7 @@ are:</p></div>
         pattern, the include condition is met.

 </p>

 <div class="paragraph"><p>The .git location may be auto-discovered, or come from <code>$GIT_DIR</code>

-environment variable. If the repository is auto discovered via a .git

+environment variable. If the repository is auto-discovered via a .git

 file (e.g. from submodules, or a linked worktree), the .git location

 would be the final location where the .git directory is, not where the

 .git file is.</p></div>

@@ -1995,7 +1995,7 @@ ambiguousFetchRefspec
 </dt>

 <dd>

 <p>

-                Advice shown when fetch refspec for multiple remotes map to

+                Advice shown when a fetch refspec for multiple remotes maps to

                 the same remote-tracking branch namespace and causes branch

                 tracking set-up to fail.

 </p>

@@ -2125,7 +2125,7 @@ statusHints
                 the template shown when writing commit messages in

                 <a href="git-commit.html">git-commit(1)</a>, and in the help message shown

                 by <a href="git-switch.html">git-switch(1)</a> or

-                <a href="git-checkout.html">git-checkout(1)</a> when switching branch.

+                <a href="git-checkout.html">git-checkout(1)</a> when switching branches.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -2191,7 +2191,7 @@ detachedHead
 <p>

                 Advice shown when you used

                 <a href="git-switch.html">git-switch(1)</a> or <a href="git-checkout.html">git-checkout(1)</a>

-                to move to the detach HEAD state, to instruct how to

+                to move to the detached HEAD state, to instruct how to

                 create a local branch after the fact.

 </p>

 </dd>

@@ -2217,7 +2217,7 @@ checkoutAmbiguousRemoteBranchName
                 otherwise caused a remote-tracking branch to be

                 checked out. See the <code>checkout.defaultRemote</code>

                 configuration variable for how to set a given remote

-                to used by default in some situations where this

+                to be used by default in some situations where this

                 advice would be printed.

 </p>

 </dd>

@@ -3487,7 +3487,7 @@ alias.*
         <code>git last</code> is equivalent to <code>git cat-file commit HEAD</code>. To avoid

         confusion and troubles with script usage, aliases that

         hide existing Git commands are ignored. Arguments are split by

-        spaces, the usual shell quoting and escaping is supported.

+        spaces, the usual shell quoting and escaping are supported.

         A quote pair or a backslash can be used to quote them.

 </p>

 <div class="paragraph"><p>Note that the first word of an alias does not necessarily have to be a

@@ -3542,7 +3542,7 @@ apply.ignoreWhitespace
         When set to <em>change</em>, tells <em>git apply</em> to ignore changes in

         whitespace, in the same way as the <code>--ignore-space-change</code>

         option.

-        When set to one of: no, none, never, false tells <em>git apply</em> to

+        When set to one of: no, none, never, false, it tells <em>git apply</em> to

         respect all whitespace differences.

         See <a href="git-apply.html">git-apply(1)</a>.

 </p>

@@ -3552,7 +3552,7 @@ apply.whitespace
 </dt>

 <dd>

 <p>

-        Tells <em>git apply</em> how to handle whitespaces, in the same way

+        Tells <em>git apply</em> how to handle whitespace, in the same way

         as the <code>--whitespace</code> option. See <a href="git-apply.html">git-apply(1)</a>.

 </p>

 </dd>

@@ -3690,7 +3690,7 @@ branch.&lt;name&gt;.remote
 <dd>

 <p>

         When on branch &lt;name&gt;, it tells <em>git fetch</em> and <em>git push</em>

-        which remote to fetch from/push to.  The remote to push to

+        which remote to fetch from or push to.  The remote to push to

         may be overridden with <code>remote.pushDefault</code> (for all branches).

         The remote to push to, for the current branch, may be further

         overridden by <code>branch.&lt;name&gt;.pushRemote</code>.  If no remote is

@@ -3728,7 +3728,7 @@ branch.&lt;name&gt;.merge
         handled like the remote part of a refspec, and must match a

         ref which is fetched from the remote given by

         "branch.&lt;name&gt;.remote".

-        The merge information is used by <em>git pull</em> (which at first calls

+        The merge information is used by <em>git pull</em> (which first calls

         <em>git fetch</em>) to lookup the default branch for merging. Without

         this option, <em>git pull</em> defaults to merge the first refspec fetched.

         Specify multiple values to get an octopus merge.

@@ -3775,7 +3775,7 @@ branch.&lt;name&gt;.description
 <p>

         Branch description, can be edited with

         <code>git branch --edit-description</code>. Branch description is

-        automatically added in the format-patch cover letter or

+        automatically added to the format-patch cover letter or

         request-pull summary.

 </p>

 </dd>

@@ -3906,7 +3906,7 @@ checkout.workers
         all commands that perform checkout. E.g. checkout, clone, reset,

         sparse-checkout, etc.

 </p>

-<div class="paragraph"><p>Note: parallel checkout usually delivers better performance for repositories

+<div class="paragraph"><p>Note: Parallel checkout usually delivers better performance for repositories

 located on SSDs or over NFS. For repositories on spinning disks and/or machines

 with a small number of cores, the default sequential checkout often performs

 better. The size and compression level of a repository might also influence how

@@ -3919,7 +3919,7 @@ checkout.thresholdForParallelism
 <p>

         When running parallel checkout with a small number of files, the cost

         of subprocess spawning and inter-process communication might outweigh

-        the parallelization gains. This setting allows to define the minimum

+        the parallelization gains. This setting allows you to define the minimum

         number of files for which parallel checkout should be attempted. The

         default is 100.

 </p>

@@ -3930,7 +3930,7 @@ clean.requireForce
 <dd>

 <p>

         A boolean to make git-clean do nothing unless given -f,

-        -i or -n.   Defaults to true.

+        -i, or -n.  Defaults to true.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -3948,8 +3948,8 @@ clone.rejectShallow
 </dt>

 <dd>

 <p>

-        Reject to clone a repository if it is a shallow one, can be overridden by

-        passing option <code>--reject-shallow</code> in command line. See <a href="git-clone.html">git-clone(1)</a>

+        Reject cloning a repository if it is a shallow one; this can be overridden by

+        passing the <code>--reject-shallow</code> option on the command line. See <a href="git-clone.html">git-clone(1)</a>

 </p>

 </dd>

 <dt class="hdlist1">

@@ -4168,7 +4168,7 @@ color.grep.&lt;slot&gt;
 <dd>

 <p>

         matching text in selected lines. Also, used to customize the following

-        <a href="git-log.html">git-log(1)</a> subcommands: <code>--grep</code>, <code>--author</code> and <code>--committer</code>.

+        <a href="git-log.html">git-log(1)</a> subcommands: <code>--grep</code>, <code>--author</code>, and <code>--committer</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -4457,7 +4457,7 @@ column.clean
 </dt>

 <dd>

 <p>

-        Specify the layout when list items in <code>git clean -i</code>, which always

+        Specify the layout when listing items in <code>git clean -i</code>, which always

         shows files and directories in columns. See <code>column.ui</code> for details.

 </p>

 </dd>

@@ -4475,7 +4475,7 @@ column.tag
 </dt>

 <dd>

 <p>

-        Specify whether to output tag listing in <code>git tag</code> in columns.

+        Specify whether to output tag listings in <code>git tag</code> in columns.

         See <code>column.ui</code> for details.

 </p>

 </dd>

@@ -4487,7 +4487,7 @@ commit.cleanup
         This setting overrides the default of the <code>--cleanup</code> option in

         <code>git commit</code>. See <a href="git-commit.html">git-commit(1)</a> for details. Changing the

         default can be useful when you always want to keep lines that begin

-        with comment character <code>#</code> in your log message, in which case you

+        with the comment character <code>#</code> in your log message, in which case you

         would do <code>git config commit.cleanup whitespace</code> (note that you will

         have to remove the help lines that begin with <code>#</code> in the commit log

         template yourself, if you do this).

@@ -4529,7 +4529,7 @@ commit.verbose
 </dt>

 <dd>

 <p>

-        A boolean or int to specify the level of verbose with <code>git commit</code>.

+        A boolean or int to specify the level of verbosity with <code>git commit</code>.

         See <a href="git-commit.html">git-commit(1)</a>.

 </p>

 </dd>

@@ -4604,7 +4604,7 @@ credential.&lt;url&gt;.*
 <dd>

 <p>

         Any of the credential.* options above can be applied selectively to

-        some credentials. For example "credential.https://example.com.username"

+        some credentials. For example, "credential.https://example.com.username"

         would set the default username only for https connections to

         example.com. See <a href="gitcredentials.html">gitcredentials(7)</a> for details on how URLs are

         matched.

@@ -4624,7 +4624,7 @@ credentialStore.lockTimeoutMS
 <dd>

 <p>

         The length of time, in milliseconds, for git-credential-store to retry

-        when trying to lock the credentials file. Value 0 means not to retry at

+        when trying to lock the credentials file. A value of 0 means not to retry at

         all; -1 means to try indefinitely. Default is 1000 (i.e., retry for

         1s).

 </p>

@@ -4648,7 +4648,7 @@ diff.autoRefreshIndex
 <dd>

 <p>

         When using <em>git diff</em> to compare with work tree

-        files, do not consider stat-only change as changed.

+        files, do not consider stat-only changes as changed.

         Instead, silently run <code>git update-index --refresh</code> to

         update the cached stat information for paths whose

         contents in the work tree match the contents in the

@@ -5429,8 +5429,8 @@ fastimport.unpackLimit
 <p>

         If the number of objects imported by <a href="git-fast-import.html">git-fast-import(1)</a>

         is below this limit, then the objects will be unpacked into

-        loose object files.  However if the number of imported objects

-        equals or exceeds this limit then the pack will be stored as a

+        loose object files.  However, if the number of imported objects

+        equals or exceeds this limit, then the pack will be stored as a

         pack.  Storing the pack from a fast-import can make the import

         operation complete faster, especially on slow filesystems.  If

         not set, the value of <code>transfer.unpackLimit</code> is used instead.

@@ -5598,8 +5598,8 @@ fetch.output
 <dd>

 <p>

         Control how ref update status is printed. Valid values are

-        <code>full</code> and <code>compact</code>. Default value is <code>full</code>. See section

-        OUTPUT in <a href="git-fetch.html">git-fetch(1)</a> for detail.

+        <code>full</code> and <code>compact</code>. Default value is <code>full</code>. See the

+        OUTPUT section in <a href="git-fetch.html">git-fetch(1)</a> for details.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -5829,7 +5829,7 @@ format.pretty
 </dt>

 <dd>

 <p>

-        The default pretty format for log/show/whatchanged command,

+        The default pretty format for log/show/whatchanged command.

         See <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>,

         <a href="git-whatchanged.html">git-whatchanged(1)</a>.

 </p>

@@ -5991,12 +5991,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>,

@@ -6011,7 +6011,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">

@@ -6021,12 +6021,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

@@ -6034,10 +6034,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

@@ -6050,7 +6050,7 @@ fsmonitor.allowRemote
 </dt>

 <dd>

 <p>

-    By default, the fsmonitor daemon refuses to work against network-mounted

+    By default, the fsmonitor daemon refuses to work with network-mounted

     repositories. Setting <code>fsmonitor.allowRemote</code> to <code>true</code> overrides this

     behavior.  Only respected when <code>core.fsmonitor</code> is set to <code>true</code>.

 </p>

@@ -6105,7 +6105,7 @@ gc.auto
         default value is 6700.

 </p>

 <div class="paragraph"><p>Setting this to 0 disables not only automatic packing based on the

-number of loose objects, but any other heuristic <code>git gc --auto</code> will

+number of loose objects, but also any other heuristic <code>git gc --auto</code> will

 otherwise use to determine if there&#8217;s work to do, such as

 <code>gc.autoPackLimit</code>.</p></div>

 </dd>

@@ -6128,7 +6128,7 @@ gc.autoDetach
 </dt>

 <dd>

 <p>

-        Make <code>git gc --auto</code> return immediately and run in background

+        Make <code>git gc --auto</code> return immediately and run in the background

         if the system supports it. Default is true.

 </p>

 </dd>

@@ -6581,7 +6581,7 @@ gpg.program
         same command-line interface as GPG, namely, to verify a detached

         signature, "<code>gpg --verify $signature - &lt;$file</code>" is run, and the

         program is expected to signal a good signature by exiting with

-        code 0, and to generate an ASCII-armored detached signature, the

+        code 0.  To generate an ASCII-armored detached signature, the

         standard input of "<code>gpg -bsau $key</code>" is fed with the contents to be

         signed, and the program is expected to send the result to its

         standard output.

@@ -6616,7 +6616,7 @@ gpg.minTrustLevel
 <p>

         Specifies a minimum trust level for signature verification.  If

         this option is unset, then signature verification for merge

-        operations require a key with at least <code>marginal</code> trust.  Other

+        operations requires a key with at least <code>marginal</code> trust.  Other

         operations that perform signature verification require a key

         with at least <code>undefined</code> trust.  Setting this option overrides

         the required trust-level for all operations.  Supported values,

@@ -6655,7 +6655,7 @@ gpg.ssh.defaultKeyCommand
 </dt>

 <dd>

 <p>

-        This command that will be run when user.signingkey is not set and a ssh

+        This command will be run when user.signingkey is not set and a ssh

         signature is requested. On successful exit a valid ssh public key

         prefixed with <code>key::</code> is expected in the first line of its output.

         This allows for a script doing a dynamic lookup of the correct public

@@ -6762,7 +6762,7 @@ gui.newBranchTemplate
 </dt>

 <dd>

 <p>

-        Is used as suggested name when creating new branches using the

+        Is used as a suggested name when creating new branches using the

         <a href="git-gui.html">git-gui(1)</a>.

 </p>

 </dd>

@@ -7481,7 +7481,7 @@ http.noEPSV
 <dd>

 <p>

         A boolean which disables using of EPSV ftp command by curl.

-        This can helpful with some "poor" ftp servers which don&#8217;t

+        This can be helpful with some "poor" ftp servers which don&#8217;t

         support EPSV mode. Can be overridden by the <code>GIT_CURL_FTP_NO_EPSV</code>

         environment variable. Default is false (curl will use EPSV).

 </p>

@@ -7492,7 +7492,7 @@ http.userAgent
 <dd>

 <p>

         The HTTP USER_AGENT string presented to an HTTP server.  The default

-        value represents the version of the client Git such as git/1.7.1.

+        value represents the version of the Git client such as git/1.7.1.

         This option allows you to override this value to a more common value

         such as Mozilla/4.0.  This may be necessary, for instance, if

         connecting through a firewall that restricts HTTP connections to a set

@@ -7592,7 +7592,7 @@ i18n.commitEncoding
         Character encoding the commit messages are stored in; Git itself

         does not care per se, but this information is necessary e.g. when

         importing commits from emails or in the gitk graphical history

-        browser (and possibly at other places in the future or in other

+        browser (and possibly in other places in the future or in other

         porcelains). See e.g. <a href="git-mailinfo.html">git-mailinfo(1)</a>. Defaults to <em>utf-8</em>.

 </p>

 </dd>

@@ -7620,7 +7620,7 @@ imap.tunnel
 </dt>

 <dd>

 <p>

-        Command used to setup a tunnel to the IMAP server through which

+        Command used to set up a tunnel to the IMAP server through which

         commands will be piped instead of using a direct network connection

         to the server. Required when imap.host is not set.

 </p>

@@ -7688,7 +7688,7 @@ imap.authMethod
 </dt>

 <dd>

 <p>

-        Specify authenticate method for authentication with IMAP server.

+        Specify the authentication method for authenticating with the IMAP server.

         If Git was built with the NO_CURL option, or if your curl version is older

         than 7.34.0, or if you&#8217;re running git-imap-send with the <code>--no-curl</code>

         option, the only supported method is <em>CRAM-MD5</em>. If this is not set

@@ -7753,7 +7753,7 @@ index.threads
         Specifies the number of threads to spawn when loading the index.

         This is meant to reduce index load time on multiprocessor machines.

         Specifying 0 or <em>true</em> will cause Git to auto-detect the number of

-        CPU&#8217;s and set the number of threads accordingly. Specifying 1 or

+        CPUs and set the number of threads accordingly. Specifying 1 or

         <em>false</em> will disable multithreading. Defaults to <em>true</em>.

 </p>

 </dd>

@@ -7894,7 +7894,7 @@ log.date
         <code>--date</code> option.  See <a href="git-log.html">git-log(1)</a> for details.

 </p>

 <div class="paragraph"><p>If the format is set to "auto:foo" and the pager is in use, format

-"foo" will be the used for the date format. Otherwise "default" will

+"foo" will be used for the date format. Otherwise, "default" will

 be used.</p></div>

 </dd>

 <dt class="hdlist1">

@@ -8015,7 +8015,7 @@ mailinfo.scissors
 <p>

         If true, makes <a href="git-mailinfo.html">git-mailinfo(1)</a> (and therefore

         <a href="git-am.html">git-am(1)</a>) act by default as if the --scissors option

-        was provided on the command-line. When active, this features

+        was provided on the command-line. When active, this feature

         removes everything from the message body before a scissors

         line (i.e. consisting mainly of "&gt;8", "8&lt;" and "-").

 </p>

@@ -8072,7 +8072,7 @@ maintenance.strategy
 <div class="ulist"><ul>

 <li>

 <p>

-<code>none</code>: This default setting implies no task are run at any schedule.

+<code>none</code>: This default setting implies no tasks are run at any schedule.

 </p>

 </li>

 <li>

@@ -8167,7 +8167,7 @@ man.&lt;tool&gt;.cmd
 <p>

         Specify the command to invoke the specified man viewer. The

         specified command is evaluated in shell with the man page

-        passed as argument. (See <a href="git-help.html">git-help(1)</a>.)

+        passed as an argument. (See <a href="git-help.html">git-help(1)</a>.)

 </p>

 </dd>

 <dt class="hdlist1">

@@ -8192,7 +8192,7 @@ merge.conflictStyle
         marker and the original text before the <code>=======</code> marker.  The

         "merge" style tends to produce smaller conflict regions than diff3,

         both because of the exclusion of the original text, and because

-        when a subset of lines match on the two sides they are just pulled

+        when a subset of lines match on the two sides, they are just pulled

         out of the conflict region.  Another alternate style, "zdiff3", is

         similar to diff3 but removes matching lines on the two sides from

         the conflict region when those matching lines appear near either

@@ -8727,8 +8727,8 @@ mergetool.&lt;tool&gt;.trustExitCode
         For a custom merge command, specify whether the exit code of

         the merge command can be used to determine whether the merge was

         successful.  If this is not set to true then the merge target file

-        timestamp is checked and the merge assumed to have been successful

-        if the file has been updated, otherwise the user is prompted to

+        timestamp is checked, and the merge is assumed to have been successful

+        if the file has been updated; otherwise, the user is prompted to

         indicate the success of the merge.

 </p>

 </dd>

@@ -8752,7 +8752,7 @@ mergetool.meld.useAutoMerge
 <dd>

 <p>

         When the <code>--auto-merge</code> is given, meld will merge all non-conflicting

-        parts automatically, highlight the conflicting parts and wait for

+        parts automatically, highlight the conflicting parts, and wait for

         user decision.  Setting <code>mergetool.meld.useAutoMerge</code> to <code>true</code> tells

         Git to unconditionally use the <code>--auto-merge</code> option with <code>meld</code>.

         Setting this value to <code>auto</code> makes git detect whether <code>--auto-merge</code>

@@ -8767,7 +8767,7 @@ mergetool.vimdiff.layout
 <dd>

 <p>

         The vimdiff backend uses this variable to control how its split

-        windows look like. Applies even if you are using Neovim (<code>nvim</code>) or

+        windows appear. Applies even if you are using Neovim (<code>nvim</code>) or

         gVim (<code>gvim</code>) as the merge tool. See BACKEND SPECIFIC HINTS section

         in <a href="git-mergetool.html">git-mergetool(1)</a>.

         for details.

@@ -8778,7 +8778,7 @@ mergetool.hideResolved
 </dt>

 <dd>

 <p>

-        During a merge Git will automatically resolve as many conflicts as

+        During a merge, Git will automatically resolve as many conflicts as

         possible and write the <em>MERGED</em> file containing conflict markers around

         any conflicts that it cannot resolve; <em>LOCAL</em> and <em>REMOTE</em> normally

         represent the versions of the file from before Git&#8217;s conflict

@@ -8807,7 +8807,7 @@ mergetool.keepTemporaries
         When invoking a custom merge tool, Git uses a set of temporary

         files to pass to the tool. If the tool returns an error and this

         variable is set to <code>true</code>, then these temporary files will be

-        preserved, otherwise they will be removed after the tool has

+        preserved; otherwise, they will be removed after the tool has

         exited. Defaults to <code>false</code>.

 </p>

 </dd>

@@ -8849,7 +8849,7 @@ notes.mergeStrategy
 <p>

         Which merge strategy to choose by default when resolving notes

         conflicts.  Must be one of <code>manual</code>, <code>ours</code>, <code>theirs</code>, <code>union</code>, or

-        <code>cat_sort_uniq</code>.  Defaults to <code>manual</code>.  See "NOTES MERGE STRATEGIES"

+        <code>cat_sort_uniq</code>.  Defaults to <code>manual</code>.  See the "NOTES MERGE STRATEGIES"

         section of <a href="git-notes.html">git-notes(1)</a> for more information on each strategy.

 </p>

 <div class="paragraph"><p>This setting can be overridden by passing the <code>--strategy</code> option to

@@ -9056,7 +9056,7 @@ pack.threads
         warning. This is meant to reduce packing time on multiprocessor

         machines. The required amount of memory for the delta search window

         is however multiplied by the number of threads.

-        Specifying 0 will cause Git to auto-detect the number of CPU&#8217;s

+        Specifying 0 will cause Git to auto-detect the number of CPUs

         and set the number of threads accordingly.

 </p>

 </dd>

@@ -9070,11 +9070,11 @@ pack.indexVersion
         the new pack index with capabilities for packs larger than 4 GB

         as well as proper protection against the repacking of corrupted

         packs.  Version 2 is the default.  Note that version 2 is enforced

-        and this config option ignored whenever the corresponding pack is

+        and this config option is ignored whenever the corresponding pack is

         larger than 2 GB.

 </p>

 <div class="paragraph"><p>If you have an old Git that does not understand the version 2 <code>*.idx</code> file,

-cloning or fetching over a non native protocol (e.g. "http")

+cloning or fetching over a non-native protocol (e.g. "http")

 that will copy both <code>*.pack</code> file and corresponding <code>*.idx</code> file from the

 other side may give you a repository that cannot be accessed with your

 older version of Git. If the <code>*.pack</code> file is smaller than 2 GB, however,

@@ -9093,8 +9093,8 @@ pack.packSizeLimit
         in the creation of multiple packfiles.

 </p>

 <div class="paragraph"><p>Note that this option is rarely useful, and may result in a larger total

-on-disk size (because Git will not store deltas between packs), as well

-as worse runtime performance (object lookup within multiple packs is

+on-disk size (because Git will not store deltas between packs) and

+worse runtime performance (object lookup within multiple packs is

 slower than a single pack, and optimizations like reachability bitmaps

 cannot cope with multiple packs).</p></div>

 <div class="paragraph"><p>If you need to actively run Git using smaller packfiles (e.g., because your

@@ -9487,7 +9487,7 @@ push.default
 </li>

 <li>

 <p>

-<code>simple</code> - pushes the current branch with the same name on the remote.

+<code>simple</code> - push the current branch with the same name on the remote.

 </p>

 <div class="paragraph"><p>If you are working on a centralized workflow (pushing to the same repository you

 pull from, which is typically <code>origin</code>), then you need to configure an upstream

@@ -9524,7 +9524,7 @@ push.followTags
 </dt>

 <dd>

 <p>

-        If set to true enable <code>--follow-tags</code> option by default.  You

+        If set to true, enable <code>--follow-tags</code> option by default.  You

         may override this configuration at time of push by specifying

         <code>--no-follow-tags</code>.

 </p>

@@ -9797,7 +9797,7 @@ receive.certNonceSeed
 <dd>

 <p>

         By setting this variable to a string, <code>git receive-pack</code>

-        will accept a <code>git push --signed</code> and verifies it by using

+        will accept a <code>git push --signed</code> and verify it by using

         a "nonce" protected by HMAC using this string as a secret

         key.

 </p>

@@ -9807,7 +9807,7 @@ receive.certNonceSlop
 </dt>

 <dd>

 <p>

-        When a <code>git push --signed</code> sent a push certificate with a

+        When a <code>git push --signed</code> sends a push certificate with a

         "nonce" that was issued by a receive-pack serving the same

         repository within this many seconds, export the "nonce"

         found in the certificate to <code>GIT_PUSH_CERT_NONCE</code> to the

@@ -10273,7 +10273,7 @@ rerere.autoUpdate
 <p>

         When set to true, <code>git-rerere</code> updates the index with the

         resulting contents after it cleanly resolves conflicts using

-        previously recorded resolution.  Defaults to false.

+        previously recorded resolutions.  Defaults to false.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -10324,7 +10324,7 @@ config. This will protect you from attacks that involve cloning a
 repository that contains a bare repository and running a Git command

 within that directory.</p></div>

 <div class="paragraph"><p>This config setting is only respected in protected configuration (see

-<a href="#SCOPES">[SCOPES]</a>). This prevents the untrusted repository from tampering with

+<a href="#SCOPES">[SCOPES]</a>). This prevents untrusted repositories from tampering with

 this value.</p></div>

 </li>

 </ul></div>

@@ -10347,7 +10347,7 @@ via <code>git config --add</code>. To reset the list of safe directories (e.g. t
 override any such directories specified in the system config), add a

 <code>safe.directory</code> entry with an empty value.</p></div>

 <div class="paragraph"><p>This config setting is only respected in protected configuration (see

-<a href="#SCOPES">[SCOPES]</a>). This prevents the untrusted repository from tampering with this

+<a href="#SCOPES">[SCOPES]</a>). This prevents untrusted repositories from tampering with this

 value.</p></div>

 <div class="paragraph"><p>The value of this setting is interpolated, i.e. <code>~/&lt;path&gt;</code> expands to a

 path relative to the home directory and <code>%(prefix)/&lt;path&gt;</code> expands to a

@@ -10449,7 +10449,7 @@ sendemail.aliasFileType
 <dd>

 <p>

         Format of the file(s) specified in sendemail.aliasesFile. Must be

-        one of <em>mutt</em>, <em>mailrc</em>, <em>pine</em>, <em>elm</em>, or <em>gnus</em>, or <em>sendmail</em>.

+        one of <em>mutt</em>, <em>mailrc</em>, <em>pine</em>, <em>elm</em>, <em>gnus</em>, or <em>sendmail</em>.

 </p>

 <div class="paragraph"><p>What an alias file in each format looks like can be found in

 the documentation of the email program of the same name. The

@@ -10592,7 +10592,7 @@ sendemail.smtpReloginDelay
 </dt>

 <dd>

 <p>

-        Seconds wait before reconnecting to smtp server.

+        Seconds to wait before reconnecting to the smtp server.

         See also the <code>--relogin-delay</code> option of <a href="git-send-email.html">git-send-email(1)</a>.

 </p>

 </dd>

@@ -10614,7 +10614,7 @@ sequence.editor
         Text editor used by <code>git rebase -i</code> for editing the rebase instruction file.

         The value is meant to be interpreted by the shell when it is used.

         It can be overridden by the <code>GIT_SEQUENCE_EDITOR</code> environment variable.

-        When not configured the default commit message editor is used instead.

+        When not configured, the default commit message editor is used instead.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -10665,10 +10665,10 @@ splitIndex.maxPercentChange
         percent of entries the split index can contain compared to the

         total number of entries in both the split index and the shared

         index before a new shared index is written.

-        The value should be between 0 and 100. If the value is 0 then

-        a new shared index is always written, if it is 100 a new

+        The value should be between 0 and 100. If the value is 0, then

+        a new shared index is always written; if it is 100, a new

         shared index is never written.

-        By default the value is 20, so a new shared index is written

+        By default, the value is 20, so a new shared index is written

         if the number of entries in the split index would be greater

         than 20 percent of the total number of entries.

         See <a href="git-update-index.html">git-update-index(1)</a>.

@@ -10835,7 +10835,7 @@ status.showUntrackedFiles
         contain only untracked files, are shown with the directory name

         only. Showing untracked files means that Git needs to lstat() all

         the files in the whole repository, which might be slow on some

-        systems. So, this variable controls how the commands displays

+        systems. So, this variable controls how the commands display

         the untracked files. Possible values are:

 </p>

 <div class="openblock">

@@ -10868,7 +10868,7 @@ status.submoduleSummary
 <dd>

 <p>

         Defaults to false.

-        If this is set to a non zero number or true (identical to -1 or an

+        If this is set to a non-zero number or true (identical to -1 or an

         unlimited number), the submodule summary will be enabled and a

         summary of commits for modified submodules will be shown (see

         --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>). Please note

@@ -10890,7 +10890,7 @@ stash.showIncludeUntracked
 <p>

         If this is set to true, the <code>git stash show</code> command will show

         the untracked files of a stash entry.  Defaults to false. See

-        description of <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.

+        the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -10900,7 +10900,7 @@ stash.showPatch
 <p>

         If this is set to true, the <code>git stash show</code> command without an

         option will show the stash entry in patch form.  Defaults to false.

-        See description of <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.

+        See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -10909,8 +10909,8 @@ stash.showStat
 <dd>

 <p>

         If this is set to true, the <code>git stash show</code> command without an

-        option will show diffstat of the stash entry.  Defaults to true.

-        See description of <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.

+        option will show a diffstat of the stash entry.  Defaults to true.

+        See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -10921,7 +10921,7 @@ submodule.&lt;name&gt;.url
         The URL for a submodule. This variable is copied from the .gitmodules

         file to the git config via <em>git submodule init</em>. The user can change

         the configured URL before obtaining the submodule via <em>git submodule

-        update</em>. If neither submodule.&lt;name&gt;.active or submodule.active are

+        update</em>. If neither submodule.&lt;name&gt;.active nor submodule.active are

         set, the presence of this variable is used as a fallback to indicate

         whether the submodule is of interest to git commands.

         See <a href="git-submodule.html">git-submodule(1)</a> and <a href="gitmodules.html">gitmodules(5)</a> for details.

@@ -10974,7 +10974,7 @@ submodule.&lt;name&gt;.ignore
         a submodule as modified. When set to "all", it will never be considered

         modified (but it will nonetheless show up in the output of status and

         commit when it has been staged), "dirty" will ignore all changes

-        to the submodules work tree and

+        to the submodule&#8217;s work tree and

         takes only differences between the HEAD of the submodule and the commit

         recorded in the superproject into account. "untracked" will additionally

         let submodules with modified tracked files in their work tree show up.

@@ -11294,7 +11294,7 @@ trace2.maxFiles
 <dd>

 <p>

         Integer.  When writing trace files to a target directory, do not

-        write additional traces if we would exceed this many files. Instead,

+        write additional traces if doing so would exceed this many files. Instead,

         write a sentinel file that will block further tracing to this

         directory. Defaults to 0, which disables this check.

 </p>

@@ -11312,7 +11312,7 @@ transfer.credentialsInUrl
         and any other direct use of the configured URL.

 </p>

 <div class="paragraph"><p>Note that this is currently limited to detecting credentials in

-<code>remote.&lt;name&gt;.url</code> configuration, it won&#8217;t detect credentials in

+<code>remote.&lt;name&gt;.url</code> configuration; it won&#8217;t detect credentials in

 <code>remote.&lt;name&gt;.pushurl</code> configuration.</p></div>

 <div class="paragraph"><p>You might want to enable this to prevent inadvertent credentials

 exposure, e.g. because:</p></div>

@@ -11340,7 +11340,7 @@ The git programs will pass the full URL to one another as arguments
   documented in procfs(5) allows for configuring this behavior.

 </p>

 <div class="paragraph"><p>If such concerns don&#8217;t apply to you then you probably don&#8217;t need to be

-concerned about credentials exposure due to storing that sensitive

+concerned about credentials exposure due to storing sensitive

 data in git&#8217;s configuration files. If you do want to use this, set

 <code>transfer.credentialsInUrl</code> to one of these values:</p></div>

 </li>

@@ -11677,14 +11677,14 @@ committer.email
 <dd>

 <p>

         The <code>user.name</code> and <code>user.email</code> variables determine what ends

-        up in the <code>author</code> and <code>committer</code> field of commit

+        up in the <code>author</code> and <code>committer</code> fields of commit

         objects.

         If you need the <code>author</code> or <code>committer</code> to be different, the

-        <code>author.name</code>, <code>author.email</code>, <code>committer.name</code> or

+        <code>author.name</code>, <code>author.email</code>, <code>committer.name</code>, or

         <code>committer.email</code> variables can be set.

-        Also, all of these can be overridden by the <code>GIT_AUTHOR_NAME</code>,

+        All of these can be overridden by the <code>GIT_AUTHOR_NAME</code>,

         <code>GIT_AUTHOR_EMAIL</code>, <code>GIT_COMMITTER_NAME</code>,

-        <code>GIT_COMMITTER_EMAIL</code> and <code>EMAIL</code> environment variables.

+        <code>GIT_COMMITTER_EMAIL</code>, and <code>EMAIL</code> environment variables.

 </p>

 <div class="paragraph"><p>Note that the <code>name</code> forms of these variables conventionally refer to

 some form of a personal name.  See <a href="git-commit.html">git-commit(1)</a> and the

@@ -11721,7 +11721,7 @@ user.signingKey
         your private ssh key or the public key when ssh-agent is used.

         Alternatively it can contain a public key prefixed with <code>key::</code>

         directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key

-        needs to be available via ssh-agent. If not set git will call

+        needs to be available via ssh-agent. If not set Git will call

         gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the

         first key available. For backward compatibility, a raw key which

         begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated

@@ -11759,13 +11759,13 @@ with those suffixes.  E.g. if "-pre" appears before "-rc" in the
 configuration, then all "1.0-preX" tags will be listed before any

 "1.0-rcX" tags.  The placement of the main release tag relative to tags

 with various suffixes can be determined by specifying the empty suffix

-among those other suffixes.  E.g. if the suffixes "-rc", "", "-ck" and

+among those other suffixes.  E.g. if the suffixes "-rc", "", "-ck", and

 "-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags

 are listed first, followed by "v4.8", then "v4.8-ckX" and finally

 "v4.8-bfsX".</p></div>

-<div class="paragraph"><p>If more than one suffixes match the same tagname, then that tagname will

+<div class="paragraph"><p>If more than one suffix matches the same tagname, then that tagname will

 be sorted according to the suffix which starts at the earliest position in

-the tagname.  If more than one different matching suffixes start at

+the tagname.  If more than one different matching suffix starts at

 that earliest position, then that tagname will be sorted according to the

 longest of those suffixes.

 The sorting order between different suffixes is undefined if they are