diff options
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/pack.adoc | 2 | ||||
| -rw-r--r-- | Documentation/config/sendemail.adoc | 2 | ||||
| -rw-r--r-- | Documentation/config/submodule.adoc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config/pack.adoc b/Documentation/config/pack.adoc index fa997c8597..22384c2d2f 100644 --- a/Documentation/config/pack.adoc +++ b/Documentation/config/pack.adoc @@ -161,7 +161,7 @@ pack.usePathWalk:: pack.preferBitmapTips:: Specifies a ref hierarchy (e.g., "refs/heads/"); can be - given multiple times to specify more than one hierarchies. + given multiple times to specify more than one hierarchy. When selecting which commits will receive bitmaps, prefer a commit at the tip of a reference that is contained in any of the configured hierarchies. diff --git a/Documentation/config/sendemail.adoc b/Documentation/config/sendemail.adoc index 6560ecc5ab..1d700559b4 100644 --- a/Documentation/config/sendemail.adoc +++ b/Documentation/config/sendemail.adoc @@ -22,7 +22,7 @@ sendemail.smtpSSLClientCert:: sendemail.smtpSSLClientKey:: Path to the client private key file that corresponds to the client certificate. To avoid misconfiguration, this configuration must be used - in conjunction with `sendemail.smtpSSLClientKey` or the + in conjunction with `sendemail.smtpSSLClientCert` or the `--smtp-ssl-client-cert` option. If the client key is included in the client certificate, the choice of private key depends on the format of the certificate. Visit https://metacpan.org/pod/IO::Socket::SSL for more diff --git a/Documentation/config/submodule.adoc b/Documentation/config/submodule.adoc index 8dacb852c7..4c424017b4 100644 --- a/Documentation/config/submodule.adoc +++ b/Documentation/config/submodule.adoc @@ -40,7 +40,7 @@ submodule.<name>.ignore:: 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. - When set to "none"(default) It also show submodules as changed if they have + When set to "none" (default) it also shows submodules as changed if they have untracked files in their work tree. This setting overrides any setting made in .gitmodules for this submodule, both settings can be overridden on the command line by using the |