summaryrefslogtreecommitdiffstats
path: root/git-config.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-01-15 16:14:51 -0800
committerJunio C Hamano <gitster@pobox.com>2021-01-15 16:14:51 -0800
commitd5cfc8f5a014ca40c71c8355aa37074cc885297e (patch)
tree349e29bf38d1ab89b921d43c9632223d8eb21e52 /git-config.html
parent674f3e1acc5b11dca193bca8d2c5d8b7008c3274 (diff)
downloadgit-htmldocs-d5cfc8f5a014ca40c71c8355aa37074cc885297e.tar.gz
Autogenerated HTML docs for v2.30.0-122-g4151f
Diffstat (limited to 'git-config.html')
-rw-r--r--git-config.html8
1 files changed, 5 insertions, 3 deletions
diff --git a/git-config.html b/git-config.html
index 65dc030c2..276f9c089 100644
--- a/git-config.html
+++ b/git-config.html
@@ -3019,6 +3019,8 @@ core.abbrev
computed based on the approximate number of packed objects
in your repository, which hopefully is enough for
abbreviated object names to stay unique for some time.
+ If set to "no", no abbreviation is made and the object names
+ are shown in their full length.
The minimum length is 4.
</p>
</dd>
@@ -6036,7 +6038,7 @@ http.proxySSLCertPasswordProtected
<p>
Enable Git&#8217;s password prompt for the proxy SSL certificate. Otherwise OpenSSL
will prompt the user, possibly many times, if the certificate or private key
- is encrypted. Can be overriden by the <code>GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED</code>
+ is encrypted. Can be overridden by the <code>GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED</code>
environment variable.
</p>
</dd>
@@ -6046,7 +6048,7 @@ http.proxySSLCAInfo
<dd>
<p>
Pathname to the file containing the certificate bundle that should be used to
- verify the proxy with when using an HTTPS proxy. Can be overriden by the
+ verify the proxy with when using an HTTPS proxy. Can be overridden by the
<code>GIT_PROXY_SSL_CAINFO</code> environment variable.
</p>
</dd>
@@ -9459,7 +9461,7 @@ trace2.envVars
<code>GIT_HTTP_USER_AGENT,GIT_CONFIG</code> would cause the trace2 output to
contain events listing the overrides for HTTP user agent and the
location of the Git configuration file (assuming any are set). May be
- overriden by the <code>GIT_TRACE2_ENV_VARS</code> environment variable. Unset by
+ overridden by the <code>GIT_TRACE2_ENV_VARS</code> environment variable. Unset by
default.
</p>
</dd>