Sync with maint

diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt
index 73430b635b5657aeeb22bef2187fcb8f56c9a394..7e9b6c8f4c2d36116be6699c0dc822222393dae6 100644 (file)
--- a/Documentation/config/core.txt
+++ b/Documentation/config/core.txt
@@ -121,11 +121,14 @@ core.quotePath::
 
 core.eol::
        Sets the line ending type to use in the working directory for
-       files that have the `text` property set when core.autocrlf is false.
+       files that are marked as text (either by having the `text`
+       attribute set, or by having `text=auto` and Git auto-detecting
+       the contents as text).
        Alternatives are 'lf', 'crlf' and 'native', which uses the platform's
        native line ending.  The default value is `native`.  See
        linkgit:gitattributes[5] for more information on end-of-line
-       conversion.
+       conversion. Note that this value is ignored if `core.autocrlf`
+       is set to `true` or `input`.
 
 core.safecrlf::
        If true, makes Git check if converting `CRLF` is reversible when
@@ -247,7 +250,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 +551,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