Merge branch 'al/send-email-auto-cte-fixup'

diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt
index 73430b635b5657aeeb22bef2187fcb8f56c9a394..d0e6635fe0b56b87826240bc80cfef40b722bef4 100644 (file)
--- a/Documentation/config/core.txt
+++ b/Documentation/config/core.txt
@@ -247,7 +247,7 @@ core.alternateRefsCommand::
        When advertising tips of available history from an alternate, use the shell to
        execute the specified command instead of linkgit:git-for-each-ref[1]. The
        first argument is the absolute path of the alternate. Output must contain one
-       hex object id per line (i.e., the same as produce by `git for-each-ref
+       hex object id per line (i.e., the same as produced by `git for-each-ref
        --format='%(objectname)'`).
 +
 Note that you cannot generally put `git for-each-ref` directly into the config
@@ -548,6 +548,12 @@ relatively high IO latencies.  When enabled, Git will do the
 index comparison to the filesystem data in parallel, allowing
 overlapping IO's.  Defaults to true.
 
+core.unsetenvvars::
+       Windows-only: comma-separated list of environment variables'
+       names that need to be unset before spawning any other process.
+       Defaults to `PERL5LIB` to account for the fact that Git for
+       Windows insists on using its own Perl interpreter.
+
 core.createObject::
        You can set this to 'link', in which case a hardlink followed by
        a delete of the source are used to make sure that object creation